aps-借调逻辑修改

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -1905,20 +1905,46 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 String processoperationequid = progressWork.getProcessoperationequid();
                 //在制品对应的工序作业输出物料ID
                 String joboutputmaterialid = progressWork.getJoboutputmaterialid();
-                //该对应工序作业的已借调卷数=已借调卷数+1
-                this.baseMapper.processAddSecondRoll(processoperationid);
+//                //该对应工序作业的已借调卷数=已借调卷数+1
+//                this.baseMapper.processAddSecondRoll(processoperationid);
 //                //将在制品的作业输出物料ID对应的所有后道工序作业的所有作业明细的待加工料卷批次号去掉“{批次号}，”
 //                this.baseMapper.processDeleteBatchNumber(batchnumber, processoperationid);
                 //查找该在制品作业明细ID对应的后道作业明细中，其工序作业的输入物料ID是该在制品的作业输出物料ID的所有作业明细，
                 //将这些作业明细的待加工料卷批次号去掉“{批次号}，”
                 this.baseMapper.updateBatchNumberByBorrow(batchnumber, processoperationequid, joboutputmaterialid);
-                //处理后续工序状态
-                Map<String, Object> params2 = new HashMap<>();
-                params2.put("processId", processoperationid);
-                R r2 = apsProcessOperationService.updateBorrowProcess(params2);
-                if (!r2.getCode().equals("200")) {
-                    return R.error(r2.getMsg());
+
+                //更新工序作业的一借调卷数
+                ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(processoperationid);
+                Integer secondroll = apsProcessOperationDo.getSecondroll() + 1;
+
+                ApsProcessOperationDo needUpdateProcess = new ApsProcessOperationDo();
+                needUpdateProcess.setId(processoperationid);
+                needUpdateProcess.setSecondroll(secondroll);
+                apsProcessOperationService.updateById(needUpdateProcess);
+
+                /**
+                 * 如果已借调卷数>已取消卷数
+                 * 本次取消卷数=1
+                 * 根据本次取消卷数更新对应工序作业的取消卷数
+                 */
+                if(secondroll > apsProcessOperationDo.getCancelroll()){
+                    CancelProcessOperationVo cancelProcessOperationVo = new CancelProcessOperationVo();
+                    cancelProcessOperationVo.setApsprocessoperationdo(apsProcessOperationDo);
+                    cancelProcessOperationVo.setCurcancelroll(1);
+                    R r = apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
+                    if (!r.getCode().equals("200")) {
+                        throw new CustomException(r.getMsg());
+                    }
                 }
+
+
+//                //处理后续工序状态
+//                Map<String, Object> params2 = new HashMap<>();
+//                params2.put("processId", processoperationid);
+//                R r2 = apsProcessOperationService.updateBorrowProcess(params2);
+//                if (!r2.getCode().equals("200")) {
+//                    return R.error(r2.getMsg());
+//                }
             }
         }