取消作业优化

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

@@ -2036,11 +2036,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             //本道工序作业
             ApsProcessOperationDo apsProcessOperationDo = cancelProcessOperationVo.getApsprocessoperationdo();
-            if (cancelProcessOperationVo.getCancelreason().equals("1")) {
+            if (cancelProcessOperationVo.getCancelreason().equals("1")) {//借调或取消
                 apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
-            } else if (cancelProcessOperationVo.getCancelreason().equals("2")) {
+            } else if (cancelProcessOperationVo.getCancelreason().equals("2")) {//输入取消
                 apsProcessOperationDo.setInputunqualifiedroll(apsProcessOperationDo.getInputunqualifiedroll() + curcancelroll);
-            } else if (cancelProcessOperationVo.getCancelreason().equals("3")) {
+            } else if (cancelProcessOperationVo.getCancelreason().equals("3")) {//输入不合格
                 apsProcessOperationDo.setInputunqualifiednum(apsProcessOperationDo.getInputunqualifiednum() + curcancelroll);
                 apsProcessOperationDo.setInputunqualifiedroll(apsProcessOperationDo.getInputunqualifiedroll() + curcancelroll);
             }
@@ -2192,12 +2192,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
      */
     @Transactional
     public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo, String cancelreason) {
-        processOperationProcessEquDo.setCancelroll(processOperationProcessEquDo.getCancelroll() + curEquCancelRoll);
-        if (cancelreason.equals("1")) {
+        if (cancelreason.equals("1")) {//借调或取消
             processOperationProcessEquDo.setCancelrollno(processOperationProcessEquDo.getCancelrollno() + curEquCancelRoll);
-        } else if (cancelreason.equals("2")) {
+        } else if (cancelreason.equals("2")) {//输入取消
             processOperationProcessEquDo.setInputunqualifiedroll(processOperationProcessEquDo.getInputunqualifiedroll() + curEquCancelRoll);
-        } else if (cancelreason.equals("3")) {
+        } else if (cancelreason.equals("3")) {//输入不合格
             processOperationProcessEquDo.setInputunqualifiednum(processOperationProcessEquDo.getInputunqualifiednum() + curEquCancelRoll);
             processOperationProcessEquDo.setInputunqualifiedroll(processOperationProcessEquDo.getInputunqualifiedroll() + curEquCancelRoll);
         }

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

@@ -611,9 +611,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 // 本次取消卷数
                 int cancelQty = toBeStartedQty >= value ? value : toBeStartedQty;
                 log.debug("工序作业:{}的本次取消卷数:{}", apsProcessOperationProcessEquDo.getId(), cancelQty);
-                // 改为取消方法更新作业输入已取消卷数
-                apsProcessOperationDo.setInputunqualifiedroll(cancelQty + apsProcessOperationDo.getInputunqualifiedroll());
-                apsProcessOperationDo.setInputunqualifiednum(cancelQty + apsProcessOperationDo.getInputunqualifiednum());
                 //取消和更新作业明细
                 apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo, "3");
                 //取消和更新工序作业
@@ -623,6 +620,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 cancelProcessOperationVo.setApsprocessoperationdo(apsProcessOperationDo);
                 cancelProcessOperationVo.setSetincancelroll(false);
                 cancelProcessOperationVo.setUpdatecuropration(false);
+                cancelProcessOperationVo.setCancelreason("3");
                 apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
                 value = value - cancelQty;
             }
@@ -973,8 +971,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     // 本次取消卷数
                     int cancelQty = toBeStartedQty >= value ? value : toBeStartedQty;
                     log.debug("工序作业:{}的本次取消卷数:{}", apsProcessOperationProcessEquDo.getId(), cancelQty);
-                    // 改为取消方法更新作业输入已取消卷数
-                    apsProcessOperationDo.setInputunqualifiedroll(cancelQty + apsProcessOperationDo.getInputunqualifiedroll());
                     //取消和更新作业明细
                     apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo, "3");
                     //取消和更新工序作业
@@ -984,6 +980,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     cancelProcessOperationVo.setApsprocessoperationdo(apsProcessOperationDo);
                     cancelProcessOperationVo.setSetincancelroll(false);
                     cancelProcessOperationVo.setUpdatecuropration(false);
+                    cancelProcessOperationVo.setCancelreason("3");
                     apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
                     value = value - cancelQty;
                 }