aps-借调逻辑优化

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

@@ -596,7 +596,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setPlanenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
                     if ("小卷成退".equals(process.getProcessType()) || "小卷包装".equals(process.getProcessType())) {
                         apsProcessOperationProcessEqu.setPlanprocessrall(process.getMinThPcNum());
-                    }else{
+                    } else {
                         apsProcessOperationProcessEqu.setPlanprocessrall(process.getOpeProducePcNum());
                     }
                     apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict());
@@ -1929,6 +1929,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                  */
                 if (secondroll > apsProcessOperationDo.getCancelroll()) {
                     CancelProcessOperationVo cancelProcessOperationVo = new CancelProcessOperationVo();
+                    apsProcessOperationDo.setSecondroll(secondroll);
                     cancelProcessOperationVo.setApsprocessoperationdo(apsProcessOperationDo);
                     cancelProcessOperationVo.setCurcancelroll(1);
                     R r = apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
@@ -2546,7 +2547,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         if (blankDeliveryDate.isEmpty()) {
             return;
         }
-        if(blankDeliveryDate.size()==1){
+        if (blankDeliveryDate.size() == 1) {
             blankDeliveryDate.add(blankDeliveryDate.get(0));
         }
         // 排程交货期-起
@@ -2560,26 +2561,26 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 .set(apsBlankOrderDo.getPromisedateend() == null, ApsBlankOrderDo::getPromisedateend, timeAddHour(endDate, 48)));
         apsBlankOrderDo.setPromisedatestart(timeAddHour(startDate, 48));
         apsBlankOrderDo.setPromisedateend(timeAddHour(endDate, 48));
-        List<String> updateIds= new ArrayList<>();
-        if(startDate.compareTo(apsBlankOrderDo.getPromisedatestart())>0){
+        List<String> updateIds = new ArrayList<>();
+        if (startDate.compareTo(apsBlankOrderDo.getPromisedatestart()) > 0) {
             updateIds.add(blankDeliveryDate.get(0).getId());
         }
-        if(endDate.compareTo(apsBlankOrderDo.getPromisedateend())>0){
+        if (endDate.compareTo(apsBlankOrderDo.getPromisedateend()) > 0) {
             updateIds.add(blankDeliveryDate.get(1).getId());
         }
-        if(updateIds.isEmpty()){
+        if (updateIds.isEmpty()) {
             return;
         }
         List<ApsProcessOperationProcessEquBackupDo> equBackupDos = apsProcessOperationProcessEquBackupDao.selectBatchIds(updateIds);
-        equBackupDos.forEach(data->{
-            data.setConflictdes(addNewConflictsDesc(data.getConflictdes(),EXCEEDING_THE_PROMISED_DELIVERY_DEADLINE));
-            if(StringUtils.isBlank(data.getConflictdes())&& StringUtils.isBlank(data.getSoftconflictdes())){
+        equBackupDos.forEach(data -> {
+            data.setConflictdes(addNewConflictsDesc(data.getConflictdes(), EXCEEDING_THE_PROMISED_DELIVERY_DEADLINE));
+            if (StringUtils.isBlank(data.getConflictdes()) && StringUtils.isBlank(data.getSoftconflictdes())) {
                 data.setHasconflict("n");
-            }else{
+            } else {
                 data.setHasconflict("y");
             }
         });
-        if(!equBackupDos.isEmpty()){
+        if (!equBackupDos.isEmpty()) {
             apsProcessOperationProcessEquBackupService.updateBatchById(equBackupDos);
         }