bugFix 甘特图

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

@@ -42,13 +42,17 @@ public class GanttServiceImpl implements GanttService {
     public static final String GANTT_ITEM_NAME_PREFIX = "%s %s";
     public static final String GANTT_DESC_PREFIX = " 计划时间：%s-%s </br>" +
             "实际时间：%s-%s </br>" +
-            "设备：%s/%s </br>";
-    public static final String GANTT_DESC = "订单产品：%s </br>" +
-            "交货期：%tF </br>" +
+            "加工设备：%s/%s </br>";
+    public static final String GANTT_DESC =
+            "输入物料：%s %d卷</br>" +
             "工序：%s </br>" +
-            "计划加工卷数：%d卷</br>" +
-            "完成情况：已开工 %d/已报工 %d/已检验 %d/未完工 %d</br>" +
-            "作业状态：%s";
+            "作业状态：%s </br>"+
+            "完成情况：已开工 %d/已报工 %d/已检验 %d/未完工 %d </br>"+
+            "客户订单号：%s </br>"+
+            "客户名称：%s </br>"+
+            "交货期：%tF </br>" +
+            "订单产品：%s </br>";
+
 
     public static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -157,9 +161,12 @@ public class GanttServiceImpl implements GanttService {
                             dateFormat(ganttVos.get(0).getActualfinishdate()),
                             ganttVos.get(0).getProcessworkshop(),ganttVos.get(0).getProcessdevice());
                     String itemDesc= ganttVos.stream().map(info->{
-                        return String.format(GANTT_DESC, info.getProductname(),info.getDeliverydate(),
-                                info.getProcessname(),info.getPlanprocessrall(),info.getStartingroll(),info.getReportroll(),
-                                info.getCheckoutroll(),info.getUnfinishroll(),info.getWorkstatus() );
+                        return String.format(GANTT_DESC,info.getInmatercondition(), info.getPlanprocessrall(),
+                                info.getProcessname(),info.getWorkstatus(),
+                                info.getStartingroll(),info.getReportroll(),
+                                info.getCheckoutroll(),info.getUnfinishroll(),
+                                info.getCustomorderno(),info.getCustomerabbreviation(),
+                                info.getDeliverydate(),info.getOutputorderproduct());
                     }).collect(Collectors.joining("</br>"));
                     dateVo = new ScheduleGanttVo();
                     dateVo.setId(workShopIndex++);

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

@@ -178,7 +178,10 @@
         or ((a6.PROMISEDELIVERYDATE is null or DATE(a6.SCHEDULEDELIVERYDATE) <= DATE(a6.PROMISEDELIVERYDATE)) and
         DATE(a6.SCHEDULEDELIVERYDATE)> DATE(a6.DELIVERYDATE)
         ),1,0) as conflict,
-        a1.SOFTCONFLICTDES
+        a1.SOFTCONFLICTDES,
+        a2.INMATERCONDITION,
+        a6.CUSTOMORDERNO,
+        a3.OUTPUTORDERPRODUCT
         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

@@ -151,4 +151,17 @@ public class GanttVos {
      * 强制冲突描述
      */
     private String softconflictdes  ="";
+    /**
+     * 输入物料描述
+     */
+    private String inmatercondition="";
+    /**
+     * 客户订单号
+     */
+    private String customorderno="";
+    /**
+     * 批量需求的输出订单产品
+     */
+    private String outputorderproduct;
+
 }