【生产成品数据】异步请求

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java

@@ -278,8 +278,8 @@ public class ChanjetController {
         chanjetSchedule.queryStock();
 
 
-        //测试
-        chanjetManager.createProductionOrder(232L);
+//        //测试
+//        chanjetManager.createProductionOrder(232L);
 //        sendProcedureReport2TPlus();
 //        chanjetSchedule.createStorageOut();
 //        chanjetSchedule.createStorageInOrder();

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

@@ -221,6 +221,9 @@ public class TaskDispatchController {
             // 将工序中的额定工时按照数量比例分摊
             List<TaskDispatchDetailOwnerDO> taskDispatchDetails = BeanUtils.toBean(updateReqVO.getTaskDispatchDetails(),TaskDispatchDetailOwnerDO.class);
             taskDispatchDetails.forEach(bo->{
+                if(updateReqVO.getDispatchStatus().equals(2)) {
+                    bo.setProcedureStatus(1);
+                }
 
                 if(updateReqVO.getTotalAmount().doubleValue()>0) {
                     bo.setWorkTime(bo.getWorkTime().multiply(BigDecimal.valueOf(bo.getAmount().doubleValue() / updateReqVO.getTotalAmount().doubleValue())));
@@ -229,9 +232,9 @@ public class TaskDispatchController {
             taskDispatchService.saveTaskDispatchDetailList(dispatchId,taskDispatchDetails);
 
             if(updateReqVO.getDispatchStatus().equals(2)){
-                taskDispatchDetailMapper.update(new LambdaUpdateWrapper<TaskDispatchDetailDO>(){{
-                    eq(TaskDispatchDetailDO::getDispatchId, taskDispatch.getId()).set(TaskDispatchDetailDO::getProcedureStatus, 1);
-                }});
+//                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);

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java

@@ -657,22 +657,24 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                         taskDispatchDetailDO.setId(null);
                         taskDispatchDetailDO.setOwner(new Long(m.trim()));
                         taskDispatchDetailDO.setDetailOwnerId(owner.getId());
-                        insertDetailList.add(taskDispatchDetailDO);
+                        taskDispatchDetailMapper.insert(taskDispatchDetailDO);
+//                        insertDetailList.add(taskDispatchDetailDO);
                     } else {
                         TaskDispatchDetailDO taskDispatchDetailDBO =
                                 detailList.stream().filter(n -> n.getDetailOwnerId().equals(owner.getId()) && n.getOwner().equals(new Long(m.trim())) && n.getProcedureId().equals(owner.getProcedureId())).collect(Collectors.toList()).get(0);
+                        owner.setProcedureStatus(taskDispatchDetailDBO.getProcedureStatus());
                         TaskDispatchDetailDO taskDispatchDetailDO = BeanUtils.toBean(owner, TaskDispatchDetailDO.class);
-                        TaskDispatchDetailDO taskDispatchDetailDONew = taskDispatchDetailMapper.selectById(taskDispatchDetailDBO.getId());
+//                        TaskDispatchDetailDO taskDispatchDetailDONew = taskDispatchDetailMapper.selectById(taskDispatchDetailDBO.getId());
                         taskDispatchDetailDO.setId(taskDispatchDetailDBO.getId());
-                        taskDispatchDetailDO.setProcedureStatus(taskDispatchDetailDONew.getProcedureStatus());
-                        updateDetailList.add(taskDispatchDetailDO);
+                        taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
+//                        updateDetailList.add(taskDispatchDetailDO);
                     }
                 });
             }
         });
 
-        if(!insertDetailList.isEmpty()) taskDispatchDetailMapper.insertBatch(insertDetailList);
-        if(!updateDetailList.isEmpty()) taskDispatchDetailMapper.updateBatch(updateDetailList);
+//        if(!insertDetailList.isEmpty()) taskDispatchDetailMapper.insertBatch(insertDetailList);
+//        if(!updateDetailList.isEmpty()) taskDispatchDetailMapper.updateBatch(updateDetailList);
     }
 
     private void updateTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailOwnerDO> list) {