生产计划 生产完成状态变更

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/plan/PlanController.java

@@ -66,23 +66,25 @@ public class PlanController {
     public CommonResult<Boolean> updatePlanStatus(@Valid @RequestBody PlanSaveReqVO updateReqVO) {
         PlanDO plan = planService.getPlan(updateReqVO.getId());
 
-        PlanPageReqVO pageReqVO = new PlanPageReqVO();
+        plan.setStatus(updateReqVO.getStatus());
-        pageReqVO.setPlanNo(plan.getPlanNo()).setPageSize(99);
+        planMapper.updateById(plan);
-        PageResult<PlanDO> pageResult = planService.getPlanOfSchedulePage(pageReqVO);
+
-
+//        PlanPageReqVO pageReqVO = new PlanPageReqVO();
-        if(pageResult.getTotal()>0){
+//        pageReqVO.setPlanNo(plan.getPlanNo()).setPageSize(99);
-            Integer orderTotal = pageResult.getList().get(0).getAmount();
+//        PageResult<PlanDO> pageResult = planService.getPlanOfSchedulePage(pageReqVO);
-            final Integer[] finishedTotal = {0};
+//        if(pageResult.getTotal()>0){
-            pageResult.getList().forEach(item ->{
+//            Integer orderTotal = pageResult.getList().get(0).getAmount();
-                finishedTotal[0] += item.getFinishedAmount();
+//            final Integer[] finishedTotal = {0};
-            });
+//            pageResult.getList().forEach(item ->{
-
+//                finishedTotal[0] += item.getFinishedAmount();
-            if(orderTotal == finishedTotal[0]){
+//            });
-                plan.setStatus(updateReqVO.getStatus());
+//
-                planMapper.updateById(plan);
+//            if(orderTotal == finishedTotal[0]){
-            }
+//                plan.setStatus(updateReqVO.getStatus());
-
+//                planMapper.updateById(plan);
-        }
+//            }
+//
+//        }
 
 
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java

@@ -174,6 +174,16 @@ public class TaskDispatchController {
             });
             taskDispatchService.saveTaskDispatchDetailList(dispatchId,updateReqVO.getTaskDispatchDetails());
 
+            if(updateReqVO.getDispatchStatus().equals(2)){
+                taskDispatchDetailMapper.update(new LambdaUpdateWrapper<TaskDispatchDetailDO>(){{
+                    eq(TaskDispatchDetailDO::getDispatchId, taskDispatch.getId()).set(TaskDispatchDetailDO::getProcedureStatus, 1);
+                }});
+
+                taskDispatchDetailOwnerMapper.update(new LambdaUpdateWrapper<TaskDispatchDetailOwnerDO>(){{
+                    eq(TaskDispatchDetailOwnerDO::getDispatchId, taskDispatch.getId()).set(TaskDispatchDetailOwnerDO::getProcedureStatus, 1);
+                }});
+            }
+
         }
         return success(null);
     }
@@ -192,16 +202,7 @@ public class TaskDispatchController {
             // 保存派工单
             taskDispatchMapper.updateById(taskDispatch);
 
-            if(updateReqVO.getDispatchStatus().equals(2)){
-                taskDispatchDetailMapper.update(new LambdaUpdateWrapper<TaskDispatchDetailDO>(){{
-                    eq(TaskDispatchDetailDO::getDispatchId, taskDispatch.getId()).set(TaskDispatchDetailDO::getProcedureStatus, 1);
-                }});
 
-                taskDispatchDetailOwnerMapper.update(new LambdaUpdateWrapper<TaskDispatchDetailOwnerDO>(){{
-                    eq(TaskDispatchDetailOwnerDO::getDispatchId, taskDispatch.getId()).set(TaskDispatchDetailOwnerDO::getProcedureStatus, 1);
-                }});
-//                taskDispatchDetailMapper.update(wrapper->wrapper.)
-            }
 
 
             // 手动记录日志