Merge branch 'wynne_temp_wc' of i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -3726,13 +3726,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
-
+        MATERIAL(10, "MATERIAL", "物料"),
-        PERSON(10, "person", "人员"),
+        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
-        EQUIPMENT(20, "equipment", "设备"),
-        MATERIAL(30, "material", "物料"),
-        ROUTE(40, "route", "工艺"),
-        ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
-        MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
 
         private int value;
         private String code;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -1213,14 +1213,8 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
-
+        MATERIAL(10, "MATERIAL", "物料"),
-        PERSON(10, "people", "人员"),
+        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
-        EQUIPMENT(20, "equipments", "设备"),
-        MATERIAL(30, "materials", "物料"),
-        ROUTE(40, "routes", "工艺"),
-        ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
-        ENVIRONMENT(60, "environment", "环境");
-
 
         private int value;
         private String code;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java

@@ -22,30 +22,17 @@ import java.util.*;
 @Api("开线管控model")
 public class WcCheckModel {
 
-    @ApiParam("人")
+    @ApiParam("工作中心")
-    private List<MesWcCheckRecord> people;
+    private String workCenterCode;
-    @ApiParam("人 列")
-    private Map<String, String> peopleColumn;
-
-    @ApiParam("机")
-    private List<MesWcCheckRecord> equipments;
-    @ApiParam("机 列")
-    private Map<String, String> equipmentsColumn;
 
-    @ApiParam("物料")
+    @ApiParam("工单")
-    private List<MesWcCheckRecord> materials;
+    private String workOrder;
-    @ApiParam("物料 列")
-    private Map<String, String> materialsColumn;
-    @ApiParam("普通列")
-    private Map<String, String> commonColumn;
 
-    @ApiParam("法")
+    @ApiParam("产品号")
-    private List<MesWcCheckRecord> routes;
+    private String partNo;
-    @ApiParam("法 列")
-    private Map<String, String> routesColumn;
 
-    @ApiParam("对象list和列关系")
+    @ApiParam("是否通过")
-    private Map<String, String> dataColumnRelation;
+    private Integer isPass;
 
     @ApiParam("开线信号")
     private Integer onlineSignal;
@@ -53,46 +40,23 @@ public class WcCheckModel {
     @ApiParam("开线对象")
     MesWcCheckRecord onlineSignalEqu;
 
-    @ApiParam("是否通过")
-    private Integer isPass;
-
-    @ApiParam("工作中心")
-    private String workCenterCode;
-
-    @ApiParam("工单")
-    private String workOrder;
-
-    @ApiParam("产品号")
-    private String partNo;
-
     @ApiParam("需要展示的数据")
-    private Map<String, String> need2ShowMap;
+    private Map<String, String> titleMap;
 
-    @ApiParam("重构map")
+    @ApiParam("对象list和列关系")
-    private Map<String, List<MesWcCheckRecord>> showMap;
+    private Map<String, Map<String, String>> dataColumnRelation;
 
+    @ApiParam("重构map")
+    private Map<String, List<MesWcCheckRecord>> dataMap;
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();
-        wcCheckModel.setPeople(new ArrayList<>());
-        wcCheckModel.setEquipments(new ArrayList<>());
-        wcCheckModel.setMaterials(new ArrayList<>());
-        wcCheckModel.setRoutes(new ArrayList<>());
-        wcCheckModel.setPeopleColumn(new HashMap<>());
-        wcCheckModel.setEquipmentsColumn(new HashMap<>());
-        wcCheckModel.setMaterialsColumn(new HashMap<>());
-        wcCheckModel.setRoutesColumn(new HashMap<>());
         wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
         wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
         onlineSignalEqu = new MesWcCheckRecord();
-        wcCheckModel.setNeed2ShowMap(new HashMap<>());
+        wcCheckModel.setTitleMap(new LinkedHashMap<>());
-
+        wcCheckModel.setDataMap(new LinkedHashMap<>());
-        Map<String, String> dataColumnRelationMap = new HashMap<>();
+        wcCheckModel.setDataColumnRelation(new LinkedHashMap<>());
-        dataColumnRelationMap.put("people", "peopleColumn");
-        dataColumnRelationMap.put("equipments", "equipmentsColumn");
-        dataColumnRelationMap.put("materials", "materialsColumn");
-        dataColumnRelationMap.put("routes", "routesColumn");
-        wcCheckModel.setDataColumnRelation(dataColumnRelationMap);
         return wcCheckModel;
     }