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 bc9c2e66..caae79f6 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 @@ -72,6 +72,7 @@ public class SysMakeOrderController extends BaseController @GetMapping("/bmzgqr/{id}") public String bmzgqr(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("currentUser", ShiroUtils.getSysUser()); SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id); mmap.put("sysMakeOrder", sysMakeOrder); return prefix + "/bmzgqr"; @@ -117,7 +118,7 @@ public class SysMakeOrderController extends BaseController if(CollectionUtil.isEmpty(makeorderDeptList)){ AjaxResult.error("部门主管确认数据不能为空!"); } - makeorderDeptService.deptReview(makeorderDeptDto); + makeorderDeptService.deptLeaderConfirm(makeorderDeptDto); return AjaxResult.success("部门评审成功!"); } 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 713f1ce7..e7129ebe 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 @@ -87,9 +87,9 @@ public interface ISysMakeorderDeptService /** * 部门主管确认 - * @param makeorderDeptList + * @param makeorderDeptDto */ - void deptLeaderConfirm(List makeorderDeptList); + void deptLeaderConfirm(SysMakeorderDeptDto makeorderDeptDto); /** * 根据生产订单号、料号生成预审数据 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 5dc8dbae..0ace05b7 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 @@ -5,6 +5,7 @@ import java.util.List; import cn.hutool.core.collection.CollectionUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysMakeOrder; import com.ruoyi.system.dto.SysMakeorderDeptDto; import com.ruoyi.system.service.ISysMakeOrderService; @@ -173,9 +174,9 @@ public class SysMakeorderDeptServiceImpl implements ISysMakeorderDeptService @Override @Transactional(rollbackFor = Exception.class) - public void deptLeaderConfirm(List makeorderDeptList) { - SysMakeorderDept makeorderDept = makeorderDeptList.get(0); - String makeNo = makeorderDept.getMakeNo(); + public void deptLeaderConfirm(SysMakeorderDeptDto makeorderDeptDto) { + String makeNo = makeorderDeptDto.getMakeNo(); + List makeorderDeptList = makeorderDeptDto.getOrderDepts(); String deptNumber = ShiroUtils.getSysUser().getDept().getDeptNumber(); // 工程部门领导确认完,生产状态更新为待工程审核 if("END".equals(deptNumber)){ @@ -186,7 +187,10 @@ public class SysMakeorderDeptServiceImpl implements ISysMakeorderDeptService makeOrderService.updateByMakeNo(makeOrder); } makeorderDeptList.forEach(dept->{ - sysMakeorderDeptMapper.updateSysMakeorderDept(dept); + String deptLeaderConfirmStatus = dept.getDeptLeaderConfirmStatus(); + if(StringUtils.isNotBlank(deptLeaderConfirmStatus)){ + sysMakeorderDeptMapper.updateSysMakeorderDept(dept); + } }); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html index 5ed9eae2..7b67718e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html @@ -11,25 +11,25 @@
- +
- +
- +
- @@ -380,7 +380,7 @@ value = subTableFormArray[parentRowIndex].deptName?subTableFormArray[parentRowIndex].deptName:value; }*/ var curIndex = parentRowIndex*5+index; - return ''; + return ''; } }, { @@ -488,7 +488,6 @@ function submitHandler() { debugger var data = $("#form-makeorder-edit").serializeArray(); - alert(JSON.stringify(data)); // saveModal 保存不关闭 $.operate.save(prefix + "/deptReview", data); // var data = $('#bootstrap-sub-table-1').bootstrapTable('getData'); diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html new file mode 100644 index 00000000..4348f475 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html @@ -0,0 +1,515 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+
+ +
+
+ + + + + \ No newline at end of file