Forráskód Böngészése

feature 甘图特查询接口增加产线

xiahan 1 éve
szülő
commit
d91d7591a9

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

@@ -340,7 +340,7 @@ public class GanttServiceImpl implements GanttService {
                 deviceVo.setOpen(true);
                 deviceVo.setType(DEFAULT_TYPE);
                 deviceVo.setParent(workShopVo.getId());
-                deviceVo.setDevicetype(deviceEntry.getValue().get(0).getDevicetype());
+//                deviceVo.setDevicetype(deviceEntry.getValue().get(0).getDevicetype());
                 deviceVo.setRender(DEFAULT_RENDER);
                 deviceVo.setStart_date(deviceEntry.getValue().get(0).getPlanstartdate());
                 deviceVo.setProductlineid(deviceEntry.getValue().get(0).getProductlineid());

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

@@ -204,9 +204,9 @@ public class GanttVos {
     /**
      * 产线名称
      */
-    private String productlinename;
+    private String productlinename="";
     /**
      * 产线ID
      */
-    private String productlineid;
+    private String productlineid="";
 }

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

@@ -114,11 +114,11 @@ public class ScheduleGanttVo {
     /**
      * 产线名称
      */
-    private String productlinename="";
+    private String productlinename;
     /**
      * 产线ID
      */
-    private String productlineid="";
+    private String productlineid;
     /**
      * 详细对象
      */