取消作业

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

@@ -2040,6 +2040,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     CancelProcessOperationVo cancelProcessOperationVo1 = new CancelProcessOperationVo();
                     cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
                     cancelProcessOperationVo1.setSetincancelroll(false);
+                    cancelProcessOperationVo1.setUpdatecuropration(false);
                     Integer nextCurCancelRoll = curcancelroll * processOperationDo.getPlanprocessrall() / apsProcessOperationDo.getPlanprocessrall();
                     cancelProcessOperationVo1.setCurcancelroll(nextCurCancelRoll);
                     processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + nextCurCancelRoll);
@@ -2137,8 +2138,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     processOperationProcessEquDo：作业明细
      */
     @Transactional
-    public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo,
-                                       ApsProcessOperationProcessEquDo processOperationProcessEquDo) {
+    public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo) {
         processOperationProcessEquDo.setCancelroll(processOperationProcessEquDo.getCancelroll() + curEquCancelRoll);
         if (processOperationProcessEquDo.getPlanprocessrall() == processOperationProcessEquDo.getCancelroll()) {
             processOperationProcessEquDo.setProcessdevice("");