Merge remote-tracking branch 'origin/dev-scheduling' into dev-scheduling

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

@@ -149,6 +149,17 @@ public class GanttServiceImpl implements GanttService {
                     dateVo.setLockmark(ganttVos.stream().map(GanttVos::getLockmark).distinct().collect(Collectors.joining(",")));
                     dateVo.setConflict(ganttVos.get(0).getConflict());
                     dateVo.setProductionorderid(ganttVos.stream().map(GanttVos::getProductionorderid).collect(Collectors.joining(",")));
+                    // 冲突描述
+                    List<GanttVos> conflictdes = ganttVos.stream().filter(v -> StringUtils.isNotBlank(v.getConflictdes())).collect(Collectors.toList());
+                    if(conflictdes != null && conflictdes.size()>0){
+                        String desc = conflictdes.stream().map(GanttVos::getConflictdes).collect(Collectors.joining(";"));
+                        dateVo.setConflictdes(desc);
+                        // 有冲突描述时
+                        if(StringUtils.isNotBlank(desc)){
+                            dateVo.setConflict(true);
+                        }
+                    }
+
                     resultVo.add(dateVo);
                 }
             }

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

@@ -158,6 +158,8 @@
         a1.UNFINISHROLL,
         a1.WORKSTATUS,
         a1.LOCKMARK,
+        a1.HASCONFLICT,
+        a1.CONFLICTDES,
         (select CUSTOMERABBREVIATION from aps_customer_management where ID =
         IF(IFNULL(a5.MERGEORDERNUMBER,'')='',a6.CUSTOMID,(select CUSTOMID from aps_production_merge_order where
         ORDERNO=a5.MERGEORDERNUMBER ) )
@@ -165,6 +167,8 @@
         a1.ID,
         a3.ID AS blankOrderId,
         a6.ID AS productionorderid,
+        a6.ORDERNO,
+        a6.CUSTOMNAME,
         a2.ID as processid,
         Date(a6.PROMISEDELIVERYDATE) as PROMISEDELIVERYDATE,
         Date(a6.SCHEDULEDELIVERYDATE) as SCHEDULEDELIVERYDATE,

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

@@ -117,8 +117,21 @@ public class GanttVos {
      */
     private Date scheduledeliverydate;
 
+    /**
+     * 订单编号
+     */
+    private String orderno;
+    /**
+     * 客户名称
+     */
+    private String customname;
+
     /**
      * 冲突
      */
     private Boolean conflict;
+
+    private String hasconflict;
+
+    private String conflictdes;
 }

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

@@ -95,6 +95,10 @@ public class ScheduleGanttVo {
      * 冲突
      */
     private Boolean conflict;
+    /**
+     * 冲突
+     */
+    private String conflictdes;
     /**
      * 订单ID
      */

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -266,7 +266,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         List<EquMaintenanceStandardDo> oldMaintenanceStandardList = maintenanceStandardService.getUniqueDateByAll();
         // 将新旧两组数据拼接为一个stream，再对stream进行分组，找到分组数量大于1的(说明又重复)，将重复的数据拿到原始数据中找到源数据返回回来
         List<EquMaintenanceStandardDo> maintenanceStandardDoList = Stream.concat(newMaintenanceStandardList.stream(), oldMaintenanceStandardList.stream()).collect(Collectors.groupingBy(info ->
-                        info.getTenantid() + info.getEquipmenttype() + info.getMaintenancetype() + info.getMaintenancesite() + info.getMaintenancecontext(), Collectors.counting()))
+                info.getTenantid() + info.getEquipmenttype() + info.getMaintenancetype() + info.getMaintenancesite() + info.getMaintenancecontext(), Collectors.counting()))
                 .entrySet().stream()
                 .filter(info -> info.getValue() > 1)
                 .map(Map.Entry::getKey)
@@ -453,7 +453,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
                     .setCreatedate(newDate)
                     .setModifydate(newDate)
-                    .setTenantid(maintenancePart.getTenantid());
+                    .setTenantid(maintenanceSchedule.getTenantid());
             if ("200".equals(serialNumberCode.getCode())) {
                 Object data = serialNumberCode.getData();
                 equMaintenanceTask.setTaskid(JSONObject.parseObject(JSONObject.toJSONString(data), Map.class).get("code").toString());