diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
index a8f5575d..bc9c2e66 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
@@ -77,6 +77,17 @@ public class SysMakeOrderController extends BaseController
return prefix + "/bmzgqr";
}
+ /**
+ * 跳转工程审核页面
+ */
+ @GetMapping("/gcsh/{id}")
+ public String gcsh(@PathVariable("id") Long id, ModelMap mmap)
+ {
+ SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id);
+ mmap.put("sysMakeOrder", sysMakeOrder);
+ return prefix + "/gcsh";
+ }
+
/**
* 部门评审
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java
index b3800f87..713f1ce7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java
@@ -96,5 +96,5 @@ public interface ISysMakeorderDeptService
* @param makeNo
* @param materialNo
*/
- void generateYsDataByMakeNoAndMaterialNo(String makeNo,String materialNo);
+ void generateYsDataByMakeNoAndMaterialNo(String makeNo,String materialNo,String salesOrderType);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
index b2d8de3e..abbb38f1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
@@ -7,10 +7,12 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.system.domain.SysMakeOrder;
import com.ruoyi.system.domain.SysSalesOrderChild;
+import com.ruoyi.system.domain.SysSalesOrderVo;
import com.ruoyi.system.mapper.SysMakeOrderMapper;
import com.ruoyi.system.service.ISysMakeOrderService;
import com.ruoyi.system.service.ISysMakeorderDeptService;
import com.ruoyi.system.service.ISysSalesOrderChildService;
+import com.ruoyi.system.service.ISysSalesOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +36,9 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
@Autowired
private ISysMakeorderDeptService makeorderDeptService;
+ @Autowired
+ private ISysSalesOrderService salesOrderService;
+
@Autowired
private ISysSalesOrderChildService salesOrderChildService;
@@ -167,9 +172,17 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
@Override
public void generateMakeOrderBySalesOrderCode(String salesOrderCode) {
+ SysSalesOrderVo sysSalesOrderVo = salesOrderService.selectSysSalesOrderBySalesOrderCode(salesOrderCode);
+ String salesOrderType = sysSalesOrderVo.getSalesOrderType();
SysMakeOrder makeOrder = new SysMakeOrder();
- // 待评审
- makeOrder.setMakeStatus("0");
+ // 其他订单
+ if("2".equals(salesOrderType)){
+ // 待工程审核
+ makeOrder.setMakeStatus("2");
+ }else{
+ // 待评审
+ makeOrder.setMakeStatus("0");
+ }
// 是
makeOrder.setUseStatus("1");
makeOrder.setSaleNo(salesOrderCode);
@@ -181,7 +194,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
if(CollectionUtil.isNotEmpty(salesOrderChildList)){
salesOrderChildList.forEach(t->{
String materialCode = t.getMaterialCode();
- makeorderDeptService.generateYsDataByMakeNoAndMaterialNo(makeNo,materialCode);
+ makeorderDeptService.generateYsDataByMakeNoAndMaterialNo(makeNo,materialCode,salesOrderType);
});
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java
index ec85afbf..5dc8dbae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java
@@ -191,7 +191,7 @@ public class SysMakeorderDeptServiceImpl implements ISysMakeorderDeptService
}
@Override
- public void generateYsDataByMakeNoAndMaterialNo(String makeNo, String materialNo) {
+ public void generateYsDataByMakeNoAndMaterialNo(String makeNo, String materialNo,String salesOrderType) {
for (int i = 0; i < YS_DEPT_NUMBER_LIST.size(); i++) {
String ysDeptNumberStr = YS_DEPT_NUMBER_LIST.get(i);
String[] ysDeptNumberArray = ysDeptNumberStr.split("-");
@@ -200,6 +200,10 @@ public class SysMakeorderDeptServiceImpl implements ISysMakeorderDeptService
makeorderDept.setMaterialNo(materialNo);
makeorderDept.setDeptNumber(ysDeptNumberArray[0]);
makeorderDept.setDeptName(ysDeptNumberArray[1]);
+ // 其他订单 无需预审和主管确认
+ if("3".equals(salesOrderType)){
+ makeorderDept.setDeptLeaderConfirmStatus("1");
+ }
insertSysMakeorderDept(makeorderDept);
}
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
index f4cfc7b7..e225c2cd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
@@ -227,7 +227,9 @@
if(row.deptLeaderConfirmStatus == '0'){
actions.push('确认时间 ');
}
-
+ if(row.makeStatus == '2'){
+ actions.push('工程审核 ');
+ }
// if(row.delFlag == '0'){