feature 甘特图排查增加设备类型

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

@@ -121,6 +121,7 @@ public class GanttServiceImpl implements GanttService {
             workShopVo.setText(workShopEntry.getValue().get(0).getProcessworkshop());
             workShopVo.setOpen(true);
             workShopVo.setType(DEFAULT_TYPE);
+
             workShopVo.setStart_date(workShopEntry.getValue().get(0).getPlanstartdate());
             resultVo.add(workShopVo);
             // 对数据按照设备进行分组
@@ -134,6 +135,7 @@ public class GanttServiceImpl implements GanttService {
                 deviceVo.setOpen(true);
                 deviceVo.setType(DEFAULT_TYPE);
                 deviceVo.setParent(workShopVo.getId());
+                deviceVo.setDevicetype(workShopEntry.getValue().get(0).getDevicetype());
                 deviceVo.setRender(DEFAULT_RENDER);
                 deviceVo.setStart_date(deviceEntry.getValue().get(0).getPlanstartdate());
                 resultVo.add(deviceVo);

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

@@ -181,7 +181,8 @@
         a1.SOFTCONFLICTDES,
         a2.INMATERCONDITION,
         a6.CUSTOMORDERNO,
-        a3.OUTPUTORDERPRODUCT
+        a3.OUTPUTORDERPRODUCT,
+        c.NAME AS DEVICETYPE
         FROM
         aps_process_operation_process_equ a1
         LEFT JOIN aps_process_operation a2 ON a1.PROCESSID = a2.ID
@@ -190,6 +191,8 @@
         LEFT JOIN aps_product_detail a5 ON a4.PRODUCTID = a5.ID
         LEFT JOIN aps_production_order a6 on a6.ID= a5.MAINID
         LEFT JOIN aps_customer_management a7 on a6.CUSTOMID= a7.ID
+        left join asp_check_items b  on a1.PROCESSDEVICEID =b.ID
+        left join sys_dict c on c.DICTTYPE='asp_check_item_type' AND b.CHECKITEMTYPE =c.VALUE
         <if test="productionLineIds != null and productionLineIds.size()>0">
             LEFT JOIN aps_resources_equipment ape on ape.EQUIPMENTID = a1.PROCESSDEVICEID
             LEFT JOIN aps_production_line apl on ape.MAINID =apl.ID
@@ -236,7 +239,7 @@
             </if>
             <if test="processids != null ">and a1.PROCESSID in (${processids})</if>
         </where>
-        order by a1.PLANSTARTDATE asc,a1.PLANENDDATE asc
+        order by a1.PLANSTARTDATE asc,a1.PLANENDDATE,c.VALUE asc
     </select>
     <select id="selectNeedUpdate" resultType="com.rongwei.bsentity.vo.CommonUpdateProductionStatusReq">
         SELECT

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

@@ -163,5 +163,9 @@ public class GanttVos {
      * 批量需求的输出订单产品
      */
     private String outputorderproduct;
+    /**
+     * 设备类型
+     */
+    private String devicetype;
 
 }

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

@@ -107,6 +107,10 @@ public class ScheduleGanttVo {
      * 订单ID
      */
     private String productionorderid;
+    /**
+     * 设备类型
+     */
+    private String devicetype;
     /**
      * 详细对象
      */