取消卷数优化

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

@@ -1836,9 +1836,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             //本道工序作业
             ApsProcessOperationDo apsProcessOperationDo = cancelProcessOperationVo.getApsprocessoperationdo();
-//            if (cancelProcessOperationVo.getSetcancelroll()) {
-            apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
-//            }
+            if (cancelProcessOperationVo.getSetincancelroll()) {
+                apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
+            }
             apsProcessOperationDo.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll());
             Integer leaveWaitJobRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getReportroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll();
             apsProcessOperationDo.setLeavewaitjobroll(leaveWaitJobRoll);
@@ -1871,7 +1871,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
             for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
                 Integer curOutMaterCancelRoll = curcancelroll * apsProcessOperationOutMaterDo.getOutval();//输出物料本次取消卷数
-                if (cancelProcessOperationVo.getSetcancelroll()) {
+                if (cancelProcessOperationVo.getSetoutcancelroll()) {
                     apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
                 }
                 Integer curStockCancelRoll = 0;//本次备料取消卷数
@@ -1910,14 +1910,15 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
                             if (processOperationDo.getLeavewaitworkroll() >= curMoveCancelRoll) {
                                 cancelroll = curMoveCancelRoll;
-                                cancelProcessOperationVo1.setCurcancelroll(0);
+                                cancelProcessOperationVo1.setCurcancelroll(cancelroll);
                             } else {
                                 cancelroll = processOperationDo.getLeavewaitworkroll();
-                                cancelProcessOperationVo1.setCurcancelroll(0);
+                                cancelProcessOperationVo1.setCurcancelroll(cancelroll);
                             }
                             processOperationDo.setInputunqualifiedroll(getInputCancelRoll(apsProcessOperationDo.getPlanprocessrall(), apsProcessOperationDo.getCancelroll(), apsProcessOperationOutMaterDo));
                             cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
-                            cancelProcessOperationVo1.setSetcancelroll(cancelProcessOperationVo.getSetcancelroll());
+                            cancelProcessOperationVo1.setSetincancelroll(false);
+                            cancelProcessOperationVo1.setSetoutcancelroll(cancelProcessOperationVo.getSetoutcancelroll());
                             cancelProcessOperation(cancelProcessOperationVo1);
                         } else {
                             break;

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

@@ -325,7 +325,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         // 备份
         apsProductionOrderService.saveHistoryInfo(productionOrderDo.getId());
         // modify at [ 2024-08-08 11:09:33 ] by xh: 项目经理因需求原因不在执行如下逻辑直接结束
-        if (true){
+        if (true) {
             return;
         }
         // 坯料计划撤回发布
@@ -519,7 +519,8 @@ public class ReportCheckServiceImpl implements ReportCheckService {
             cancelProcessOperationVo.setCraftrouteid(null);
             cancelProcessOperationVo.setCurcancelroll(unqualifiedCount);
             cancelProcessOperationVo.setApsprocessoperationdo(currentProcessOperationMainDo);
-            cancelProcessOperationVo.setSetcancelroll(false);
+            cancelProcessOperationVo.setSetincancelroll(false);
+            cancelProcessOperationVo.setSetoutcancelroll(false);
             apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
         }
         log.info("更新工序作业的输出物料和在制品相关信息结束");

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/CancelProcessOperationVo.java

@@ -9,8 +9,10 @@ public class CancelProcessOperationVo {
     private String craftrouteid;
     //本次取消卷数
     private Integer curcancelroll;
-    //是否更新已取消卷数
-    private Boolean setcancelroll = true;
+    //是否更新输入已取消卷数
+    private Boolean setincancelroll = true;
+    //是否更新输出已取消卷数
+    private Boolean setoutcancelroll = true;
     //修改的作业
     private ApsProcessOperationDo apsprocessoperationdo;
 }