Jenkins自动合并

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java

@@ -67,6 +67,6 @@ public class MesWorkCell extends BaseBean {
     private String workCellType;
 
     public String getName(){
-        return this.workCellName;
+        return this.workCellCode;
     }
 }

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

@@ -276,7 +276,8 @@ public class MesEnumUtil {
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
-        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准");
+        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
+        WC_CHECK("WC_CHECK", "开线检查项");
 
         private String value;
         private String description;
@@ -1462,8 +1463,8 @@ public class MesEnumUtil {
         MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
         MES_DATASOURCE(360, "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
-        MES_PLC(390,"PLC地址清单");
+        MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
+        MES_PLC(390, "PLC地址清单");
 
         private int value;
         private String description;

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

@@ -214,7 +214,45 @@ public class MesPcnEnumUtil {
         }
 
     }
+    /**
+     * MES_TYPE_CFG 类型信息
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_TYPE_CFG {
+
+        DEFECT("DEFECT", "缺陷"),
+        DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
+        REPAIR("REPAIR", "处理措施"),
+        SCRAP("SCRAP", "报废原因"),
+        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
+        WC_CHECK("WC_CHECK", "开线检查项");
+
+        private String value;
+        private String description;
+
+        MES_TYPE_CFG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
 
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
     /**
      * MesProdBindRecord 是否是关键件
      */

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java

@@ -3,7 +3,11 @@ package cn.estsh.i3plus.pojo.base.util;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class StringUtil {
 
@@ -65,4 +69,22 @@ public class StringUtil {
 			return null;
 		}
 	}
+
+	private static Pattern linePattern = Pattern.compile("_(\\w)");
+
+	/** 驼峰转下划线 */
+	public static Map<String, Object> humpToLine(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<>();
+		for (String str : map.keySet()) {
+			str = str.toLowerCase();
+			Matcher matcher = linePattern.matcher(str);
+			StringBuffer sb = new StringBuffer();
+			while (matcher.find()) {
+				matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
+			}
+			matcher.appendTail(sb);
+			resultMap.put(sb.toString(), map.get(str));
+		}
+		return resultMap;
+	}
 }

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

@@ -36,6 +36,8 @@ public class WcCheckModel {
     private List<MesWcCheckRecord> materials;
     @ApiParam("物料 列")
     private Map<String, String> materialsColumn;
+    @ApiParam("普通列")
+    private Map<String, String> commonColumn;
 
     @ApiParam("法")
     private List<MesWcCheckRecord> routes;
@@ -66,6 +68,9 @@ public class WcCheckModel {
     @ApiParam("需要展示的数据")
     private Map<String, String> need2ShowMap;
 
+    @ApiParam("重构map")
+    private Map<String, List<MesWcCheckRecord>> showMap;
+
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java

@@ -37,10 +37,6 @@ public class MesPartObject extends BaseBean {
     @ApiParam("对象代码")
     private String objectCode;
 
-    @Column(name = "OBJECT_NAME")
-    @ApiParam("物料名称")
-    private String objectName;
-
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("生产线")
     private String workCenterCode;
@@ -60,4 +56,8 @@ public class MesPartObject extends BaseBean {
     @Transient
     @ApiParam("数据组号")
     private String groupNo;
+
+    @Transient
+    @ApiParam("对象名称")
+    private String objectName;
 }

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\12\13 14:33
+ * @Modify:
+ **/
+@Data
+public class MesPartObjectModel {
+
+    private Long id;
+
+    @ApiParam(value ="组织代码")
+    private String organizeCode;
+
+    @ApiParam(value = "创建用户")
+    private String createUser;
+
+    @ApiParam(value = "创建日期")
+    private String createDatetime;
+
+    @ApiParam(value = "修改人")
+    private String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    private String modifyDatetime;
+
+    @ApiParam(value = "有效性",example = "1")
+    private Integer isValid;
+
+    @ApiParam(value = "是否已删除",example = "2")
+    private Integer isDeleted;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("对象名称")
+    private String objectName;
+
+    public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.partNo = partNo;
+        this.objectCode = objectCode;
+        this.workCenterCode = workCenterCode;
+        this.objectName = objectName;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2057,4 +2057,28 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 质量标准配置
+     *
+     * @param qualityStandardCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(qualityStandardCfg, organizeCode);
+        if (!StringUtils.isEmpty(qualityStandardCfg.getStandardType())) {
+            DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getStandardType(), "standardType", packBean);
+        }
+        if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKey())) {
+            DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKey(), "objectKey", packBean);
+        }
+        if (!StringUtils.isEmpty(qualityStandardCfg.getObjectType())) {
+            DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getObjectType(), "objectType", packBean);
+        }
+        if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKeyValue())) {
+            DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKeyValue(), "objectKeyValue", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -99,6 +99,7 @@ public class WmsDocMovementMaster extends BaseBean {
     public Integer isTask;
 
     @Column(name = "PRIORITY")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRIORITY.class, refForeignKey = "value", value = "description")
     @ApiParam(value = "优先级", example = "1")
     public Integer priority;