feature 更新排程交货期

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

@@ -2564,6 +2564,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         // 更新数据
         this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getId, apsBlankOrderDo.getId())
                 .set(BaseDo::getDeleted, 0)
+                .set(ApsBlankOrderDo::getScheduledatestart,startDate)
+                .set(ApsBlankOrderDo::getScheduledateend,startDate)
                 .set(apsBlankOrderDo.getPromisedatestart() == null, ApsBlankOrderDo::getPromisedatestart, timeAddHour(startDate, 48))
                 .set(apsBlankOrderDo.getPromisedateend() == null, ApsBlankOrderDo::getPromisedateend, timeAddHour(endDate, 48)));
         apsBlankOrderDo.setPromisedatestart(timeAddHour(startDate, 48));

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

@@ -269,12 +269,16 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         }
         // 工序作业明细ID
         List<String> detailIds = changingWiresVos.stream().map(ChangingWiresVo::getId).collect(Collectors.toList());
+        // 需要返回的相关ID
+        List<String> returnAboutIds = changingWiresVos.stream().map(ChangingWiresVo::getReturnAboutIds).flatMap(Collection::stream).collect(Collectors.toList());
         if (detailIds.isEmpty()) {
             log.error("需要换线的工序作业id为空");
             return R.error("需要换线的工序作业id为空");
         }
         // 换线作业受影响的工序作业ID
         List<String> affectedIdList = new ArrayList<>(detailIds);
+        affectedIdList.addAll(returnAboutIds);
+
         // 获取工序作业明细
         List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos = this.baseMapper.selectBatchIds(detailIds);
         if (apsProcessOperationProcessEquDos.isEmpty()) {
@@ -449,7 +453,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         }
 
         // 重新获取甘特图数据并返回前段
-        return R.ok(ganttService.getListById(affectedIdList));
+        return R.ok(ganttService.getListById(affectedIdList.stream().distinct().collect(Collectors.toList())));
     }
 
     /**
@@ -509,6 +513,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             vo = new UpdateConflictVo();
             String id = changeStartTimeVo.getId();
             affectedIdList.add(id);
+            affectedIdList.addAll(changeStartTimeVo.getReturnAboutIds());
             ApsProcessOperationProcessEquDo processEquDo = this.getById(id);
             ApsProcessOperationDo operationDo = apsProcessOperationService.getById(processEquDo.getProcessid());
             if (operationDo == null) {
@@ -550,7 +555,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             apsBlankOrderService.updateBlankDeliveryDate(null, blankId);
         });
         // 返回受影响的数据
-        return R.ok(this.ganttService.getListById(affectedIdList));
+        return R.ok(this.ganttService.getListById(affectedIdList.stream().distinct().collect(Collectors.toList())));
     }
 
 
@@ -626,7 +631,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         this.updateById(apsProcessOperationProcessEquDo);
         // 更新坯料交货期
         apsBlankOrderService. updateBlankDeliveryDate(null,apsProcessOperationDo.getBlankid());
-
+        affectedIdList.addAll(jobDetailsVo.getReturnAboutIds());
         return R.ok(this.ganttService.getListById(affectedIdList));
     }
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/utils/ApsUtils.java

@@ -94,7 +94,7 @@ public class ApsUtils {
         if (StringUtils.isBlank(oldConflictDesc)) {
             return newConflictDesc;
         }
-        List<String> conflictdeList = new ArrayList<>(Arrays.asList(oldConflictDesc.split(";")));
+        List<String> conflictdeList = new ArrayList<>(Arrays.asList(oldConflictDesc.split(",")));
         if (!conflictdeList.contains(newConflictDesc)) {
             conflictdeList.add(newConflictDesc);
         }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsBlankOrderDo.java

@@ -216,7 +216,7 @@ public class ApsBlankOrderDo extends BaseDo {
     private Date promisedatestart;
 
     /**
-     * 承诺交货日期-止
+     * 承诺交货日期-止排程
      */
     @TableField("PROMISEDATEEND")
     private Date promisedateend;

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

@@ -4,7 +4,9 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * ChangeStartTimeVo class
@@ -34,4 +36,8 @@ public class ChangeStartTimeVo {
      */
     @NotNull(message = "计划完工时间必填")
     private Date planEndTime;
+    /**
+     * 需要返回的相关IDs
+     */
+    private List<String> returnAboutIds = new ArrayList<>();
 }

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

@@ -6,6 +6,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.validation.constraints.Future;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -49,4 +50,11 @@ public class ChangingWiresVo {
     @NotNull(message = "加工时间必填")
     @Future(message = "加工时间必须大于当前时间")
     private Date processingTime;
+
+
+
+    /**
+     * 需要返回的相关IDs
+     */
+    private List<String> returnAboutIds = new ArrayList<>();
 }

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

@@ -3,7 +3,9 @@ package com.rongwei.bsentity.vo;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * JobDetailsVo class
@@ -23,4 +25,5 @@ public class JobDetailsVo  extends  ChangingWiresVo{
      */
     @NotNull(message = "计划完工时间必填")
     private Date planEndTime;
+
 }