feature 甘特图增加预计来料日期

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

@@ -407,6 +407,9 @@ public class GanttServiceImpl implements GanttService {
                 dateVo.setWorkstatus(ganttVos.stream().map(GanttVos::getWorkstatus).distinct().collect(Collectors.joining(",")));
                 dateVo.setLockmark(ganttVos.stream().map(GanttVos::getLockmark).distinct().collect(Collectors.joining(",")));
                 dateVo.setProductionorderid(ganttVos.stream().map(GanttVos::getProductionorderid).collect(Collectors.joining(",")));
+                dateVo.setPlanhavematerialdate( ganttVos.stream().filter(data -> data.getPlanhavematerialdate() != null)
+                        .max(Comparator.comparing(GanttVos::getPlanhavematerialdate))
+                        .map(GanttVos::getPlanhavematerialdate).orElse(null));
                 // 冲突描述
                 List<GanttVos> conflictdes = ganttVos.stream().filter(v -> StringUtils.isNotBlank(v.getConflictdes())).collect(Collectors.toList());
                 if (!conflictdes.isEmpty()) {

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -188,7 +188,8 @@
         Date(a6.SCHEDULEDELIVERYDATE) as SCHEDULEDELIVERYDATE,
         a7.CUSTOMERABBREVIATION as CUSTOMERABBREVIATION,
         a7.CUSTOMERUNIT,
-        a3.BLANKNUMBER as blankNumber
+        a3.BLANKNUMBER as blankNumber,
+        a3.PLANHAVEMATERIALDATE as planhavematerialdate
         FROM
         aps_process_operation_process_equ a1
         LEFT JOIN aps_process_operation a2 ON a1.PROCESSID = a2.ID

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

@@ -221,4 +221,8 @@ public class GanttVos {
      * 坯料计划编号
      */
     private String blankNumber;
+    /**
+     * 预计来料日期
+     */
+    private Date planhavematerialdate;
 }

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

@@ -127,6 +127,10 @@ public class ScheduleGanttVo {
      * 坯料计划编号
      */
     private String blankNumber;
+    /**
+     * 预计来料日期
+     */
+    private Date planhavematerialdate;
     /**
      * 详细对象
      */