Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -21,6 +21,12 @@ public class AndonBoardModel {
     @ApiParam("工作单元名称")
     private String workCellName;
 
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @ApiParam("生产线名称")
+    private String workCenterName;
+
     @ApiParam("安灯任务编号")
     private String andonOrderNo;
 
@@ -36,9 +42,12 @@ public class AndonBoardModel {
     @ApiParam("响应时长  单位：分钟")
     private Long responseTimeCount = 0L;
 
-    @ApiParam("解决时长  单位：分钟")
+    @ApiParam("响应时长  单位：分钟")
     private Long resetTimeCount = 0L;
 
+    @ApiParam("响应时长/响应时长(通用)  单位：分钟")
+    private Long commonTimeCount = 0L;
+
     @ApiParam("安灯正常处理的次数")
     private Integer inTime = 0;
 
@@ -60,6 +69,8 @@ public class AndonBoardModel {
     @ApiParam("工位运行状态")
     private String  cellStatus;
 
+    @ApiParam("图表类型颜色")
+    private String color;
 
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
@@ -85,6 +96,8 @@ public class AndonBoardModel {
         return resetTimeCount == null ? 0 : resetTimeCount;
     }
 
-
+    public double getCommonTimeCountVal() {
+        return commonTimeCount == null ? 0 : commonTimeCount;
+    }
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.andon.model;
 
 import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -40,27 +42,54 @@ public class AndonMenuInterfaceModel{
     @ApiParam("当前安灯类型故障比例")
     private Double  proportion = 0D;
 
-    @ApiParam("当前工厂的产线故障统计")
+    @ApiParam("图表类型颜色")
-    private List<AndonMenuInterfaceModel> andonWorkcenterList;
+    private String color;
 
-    @ApiParam("当前产线的所有故障统计")
+    @ApiParam("安灯状态")
-    private List<AndonBoardModel> alarmBrokenInfoList;
+    private Integer actionCode;
 
-    @ApiParam("当前产线的未解决故障统计")
+    @ApiParam("安灯状态名称")
-    private List<AndonBoardModel> pendingSolveBrokenInfoList;
+    private String actionName;
+
+    @ApiParam("mes微服调用-故障次数占比")
+    private List<AndonBoardModel> mesBrokenRatioList;
 
-    @ApiParam("当前产线的响应时长top10")
+    @ApiParam("故障时长类型占比 / 故障次数占比 / 工厂故障信息-产线故障时长-产线时长集合")
-    private List<AndonBoardModel> responseInfoList;
+    private List<AndonBoardModel> brokenRatioList;
 
-    @ApiParam("当前产线的解决时长top10")
+    @ApiParam("工厂故障信息-产线故障时长-安灯类型集合")
-    private List<AndonBoardModel> solveInfoList;
+    private List<AndonMenuInterfaceModel> workcenterBrokenTimeList;
 
-    @ApiParam("当前产线的异常时长top10")
+    @ApiParam("工厂故障信息-产线故障时长-产线集合")
-    private List<AndonBoardModel> exceptionInfoList;
+    private List<MesWorkCenter> workCenterList;
 
-    @ApiParam("当前产线的站点状态统计")
+    @ApiParam("产线整体状态")
+    private List<AndonMenuInterfaceModel> andonWorkcenterList;
+
+    @ApiParam("产品运行状态示意图")
     private List<CellGroupStatusModel> andonCellGroupStatusList;
 
+    @ApiParam("事件设备时长TOP10")
+    private List<AndonMenuInterfaceModel> equTimeList;
+
+    @ApiParam("事件设备时长TOP10-次数")
+    private List<String> equInTimeList;
+
+    @ApiParam("事件质量时长TOP10")
+    private List<AndonMenuInterfaceModel> qualityTimeList;
+
+    @ApiParam("事件质量时长TOP10-次数")
+    private List<String> qualityInTimeList;
+
+    @ApiParam("事件物料时长TOP10")
+    private List<AndonMenuInterfaceModel> partTimeList;
+
+    @ApiParam("事件物料时长TOP10-次数")
+    private List<String> partInTimeList;
+
+    @ApiParam("当前产线的未解决故障统计")
+    private List<AndonBoardModel> pendingSolveBrokenInfoList;
+
     public double getExceptionTimeVal() {
         return exceptionTime == null ? 0 : exceptionTime;
     }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -867,4 +867,13 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    public static DdlPackBean packHqlAndonMenu(String organizeCode, String workCenterCode, String startDateTime, String endDateTime) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(workCenterCode)) {
+            DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", result);
+        }
+        DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true);
+        return result;
+    }
 }

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

@@ -947,24 +947,27 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 110060104, "物料"),
+        //下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序
-        QUALITY("QUALITY_ALARM", 110060105, "质量"),
+        EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"),
-        EQUIP("EQUMENT_ALARM", 110060106, "设备"),
+        QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"),
-        PROCESS("ROUTING_ALARM", 110060107, "工艺"),
+        PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
-        CHECK("OTHER_ALARM", 110060108, "自处理"),
+        PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
-        FIX_ERROR("FIX_ERROR", 110060109, "自动报警");
+        CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"),
+        FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
 
         private String value;
         private Integer code;
         private String description;
+        private String colour;
 
-        ALARM_TYPE(String value, Integer code, String description) {
+        ALARM_TYPE(String value, Integer code, String description, String colour) {
             this.value = value;
             this.code = code;
             this.description = description;
+            this.colour = colour;
         }
 
-         public String getValue() {
+        public String getValue() {
             return value;
         }
 
@@ -976,6 +979,10 @@ public class AndonEnumUtil {
             return description;
         }
 
+        public String getColour() {
+            return colour;
+        }
+
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -995,6 +1002,16 @@ public class AndonEnumUtil {
             }
             return tmp;
         }
+
+        public static String colourOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].colour;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

@@ -12,6 +12,88 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALENDAR_TYPE {
+        DAY(10, "日"),
+        WEEK(20, "周"),
+        MONTH(30, "月"),
+        YEAR(40, "年");
+
+        private int value;
+        private String description;
+
+        CALENDAR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int 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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXPIRE_TIME {
+
+        NEVER(-1, "不过期"),
+        ONE_HOUR(3600, "一小时"),
+        ONE_MIN(60, "一分钟");
+
+        private int value;
+        private String description;
+
+        EXPIRE_TIME(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int 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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRUE_OR_FALSE {
         TRUE(1, "是"),
@@ -341,7 +423,7 @@ public class MesEnumUtil {
     public enum IF_CONNECT_TYPE {
 
         DB("10", "DB"),
-        WEBSERVICE("20", "webservice "),
+        WEBSERVICE("20", "webservice"),
         RESTFUL("30", "restful");
 
         private String value;
@@ -779,7 +861,7 @@ public class MesEnumUtil {
 
         SCRATCH(10, "划痕"),
         FRACTURE(20, "破碎"),
-        SCRAP_TYPE3(30, "缺失");
+        SCRAP_TYPE(30, "缺失");
 
         private int value;
         private String description;
@@ -1368,16 +1450,18 @@ public class MesEnumUtil {
         MES_OBJECT_CFG(230, "对象结构"),
         MES_WC_CHECK(240, "开线检查"),
         MES_QC_CHECK_STANDARD(250, "质量检测标准"),
-        MES_FAULT_CAUSE(260,"设备故障原因"),
+        MES_FAULT_CAUSE(260, "设备故障原因"),
-        MES_FAULT_METHOD(270,"设备故障处理措施"),
+        MES_FAULT_METHOD(270, "设备故障处理措施"),
-        MES_FAULT_PHENOMENON(280,"设备故障现象"),
+        MES_FAULT_PHENOMENON(280, "设备故障现象"),
-        MES_DEFECT(290,"缺陷"),
+        MES_DEFECT(290, "缺陷"),
-        MES_DEFECT_CAUSE(300,"缺陷原因"),
+        MES_DEFECT_CAUSE(300, "缺陷原因"),
-        MES_SCRAP(310,"报废原因"),
+        MES_SCRAP(310, "报废原因"),
-        MES_REPAIR(320,"质量数据处理措施"),
+        MES_REPAIR(320, "质量数据处理措施"),
-        MES_EQU_TASK_PLAN(330,"设备作业周期计划"),
+        MES_EQU_TASK_PLAN(330, "设备作业周期计划"),
-        MES_PART_OJBECT(340,"物料对象"),
+        MES_PART_OJBECT(340, "物料对象"),
-        MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元");
+        MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
+        MES_DATASOURCE(360, "DB地址清单"),
+        MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置");
 
         private int value;
         private String description;
@@ -1787,7 +1871,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * pcn 动作类型
+     * MesProdBindRecord 动作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_TYPE {
@@ -3079,6 +3163,80 @@ public class MesEnumUtil {
     }
 
     /**
+     * 质量标准配置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUALITY_STANDARD_TYPE {
+
+        NG_RATE(10, "不良率"),
+        INNER_PPM(20, "PPM"),
+        ONLINE_PPM(30, "线上PPM");
+
+        private int value;
+        private String description;
+
+        QUALITY_STANDARD_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int 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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 质量标准配置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUALITY_OBJECT_TYPE {
+
+        ORGANIZE(10, "工厂"),
+        WORK_CENTER_CODE(20, "产线"),
+        PRODUCT(30, "产品");
+
+        private int value;
+        private String description;
+
+        QUALITY_OBJECT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int 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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * MesProduceSn实体对应的qcStatus值  条码表条码质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -707,7 +707,8 @@ public class MesPcnEnumUtil {
     public enum MES_REPAIR_STATUS {
 
         REPAIRED(10, "已维修"),
-        NO_REPAIR(20, "待维修");
+        NO_REPAIR(20, "待维修"),
+        NO_CONFIRM(30, "待确认");
 
         private int value;
         private String description;

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

@@ -51,6 +51,26 @@ public class WmsEnumUtil {
             }
             return null;
         }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String desc) {
+            int tmp = DISABLE.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -1978,7 +1998,7 @@ public class WmsEnumUtil {
      * 成功标志枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RC_OK_VALUE {
+    public enum AM_OK_VALUE {
 
         IS_TRUE(10, true, "成功"),
         IS_FALSE(20, false, "失败");
@@ -1987,7 +2007,7 @@ public class WmsEnumUtil {
         private boolean codeValue;
         private String description;
 
-        RC_OK_VALUE(int value, boolean codeValue, String description) {
+        AM_OK_VALUE(int value, boolean codeValue, String description) {
             this.value = value;
             this.codeValue = codeValue;
             this.description = description;
@@ -4407,8 +4427,9 @@ public class WmsEnumUtil {
         WAIT_RECEIVING(10, "待收货"),
         RECEIVING(20, "收货中"),
         COMPLETE_RECEIVING(30, "收货完成"),
-        UN_RECEIVED(40, "延迟未收货"),
+        CLOSE(40,"已关闭"),
-        ELSE(50,"其他");
+        CANCEL(50,"已取消"),
+        UN_RECEIVED(60, "延迟未收货");
 
         private int value;
         private String description;

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

@@ -1,5 +1,10 @@
 package cn.estsh.i3plus.pojo.base.util;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
 public class StringUtil {
 
 	public static boolean isEmpty(Object obj){
@@ -10,4 +15,54 @@ public class StringUtil {
 		
 		return false;
 	}
+
+	/**
+	 * 获取对象所有属性名
+	 * @param clazz
+	 * @return
+	 */
+	public static String[] getFields(Class clazz) {
+		Field[] fields = clazz.getDeclaredFields();
+		String[] fieldNames = new String[fields.length];
+		for(int i=0;i<fields.length;i++){
+			fieldNames[i]=fields[i].getName();
+		}
+		return fieldNames;
+	}
+
+	/**
+	 * 获取对象所有属性名
+	 * @param clazz
+	 * @return
+	 */
+	public static List<String> getFieldList(Class clazz) {
+		Field[] fields = clazz.getDeclaredFields();
+		Field[] superFields = clazz.getSuperclass().getDeclaredFields();
+		List<String> fieldNames = new ArrayList<>();
+		for(int i = 0;i < fields.length; i++){
+			fieldNames.add(fields[i].getName());
+		}
+		for(int i = 0;i < superFields.length; i++){
+			fieldNames.add(superFields[i].getName());
+		}
+		return fieldNames;
+	}
+
+	/**
+	 * 根据属性名和对象获取属性对应的值
+	 * @param fieldName
+	 * @param o
+	 * @return
+	 */
+	public static Object getFieldValueByName(String fieldName, Object o) {
+		try {
+			String firstLetter = fieldName.substring(0, 1).toUpperCase();
+			String getter = "get" + firstLetter + fieldName.substring(1);
+			Method method = o.getClass().getMethod(getter, new Class[] {});
+			Object value = method.invoke(o, new Object[] {});
+			return value;
+		} catch (Exception e) {
+			return null;
+		}
+	}
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.lac.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -75,6 +77,7 @@ public class LacSuitTaskParam extends BaseBean {
 
     @Column(name="PARAM_TYPE")
     @ApiParam(value ="参数类型")
+    @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_TYPE.class)
     private Integer paramType;
 
     @Column(name="PARAM_VALUE_TYPE")

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/12 4:00 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_WMS_PPM")
+@Api("WMS PPM 接口表")
+public class IfWmsPpm extends BaseBean {
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private String year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private String month;
+
+    @Column(name = "PPM_VALUE")
+    @ApiParam("PPM值")
+    private String ppmValue;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -132,11 +132,28 @@ public class MesProduceSn extends BaseBean {
 
     @Transient
     @ApiParam("下线开始时间")
-    private String outWorkCenterStartTime;
+    private String outWorkCenterTimeStart;
 
     @Transient
     @ApiParam("下线结束时间")
-    private String outWorkCenterEndTime;
+    private String outWorkCenterTimeEnd;
+
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -130,6 +130,30 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
+    @Transient
+    @ApiParam("下线开始时间")
+    private String outWorkCenterTimeStart;
+
+    @Transient
+    @ApiParam("下线结束时间")
+    private String outWorkCenterTimeEnd;
+
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :生产数据
@@ -106,4 +107,8 @@ public class MesProductData extends BaseBean {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Transient
+    @ApiParam("字段总数")
+    private Integer fieldNum;
+
 }

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :质量标准配置
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUALITY_STANDARD_CFG")
+@Api("质量标准配置")
+public class MesQualityStandardCfg extends BaseBean {
+
+    @Column(name = "STANDARD_TYPE")
+    @ApiParam("标准类型")
+    private Integer standardType;
+
+    @Column(name = "OBJECT_TYPE")
+    @ApiParam("对象类型")
+    private Integer objectType;
+
+    @Column(name = "OBJECT_KEY_VALUE")
+    @ApiParam("对象键值")
+    private String objectKeyValue;
+
+    @Column(name = "OBJECT_KEY")
+    @ApiParam("对象键")
+    private String objectKey;
+
+}

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

@@ -47,7 +47,7 @@ public class MesRawPartSn extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("数量")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("生产批次")
@@ -65,7 +65,7 @@ public class MesRawPartSn extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 

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

@@ -39,7 +39,7 @@ public class IfRawPartDataModel extends BaseBean {
     private String serialNumber;
 
     @ApiParam("数量")
-    private BigDecimal qty;
+    private Double qty;
 
     @ApiParam("单位")
     private String unit;

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

@@ -74,6 +74,12 @@ public class ProdBindRecordModel implements Serializable {
     @ApiParam(value = "动作类型")
     private String actionType;
 
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
+    @ApiParam(value = "动作类型名称")
+    private String actionTypeName;
+
     public ProdBindRecordModel() {
 
     }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 用于产线运行情况数据
@@ -39,7 +40,7 @@ public class ProductBiModel {
     private double outputQty;
 
     @ApiParam(value = "完成率")
-    private double CompleteRate;
+    private double completeRate;
 
     @ApiParam(value = "合格数量")
     private double passQty;
@@ -53,6 +54,9 @@ public class ProductBiModel {
     @ApiParam(value = "不良率")
     private double ngRate;
 
+    @ApiParam(value = "警戒值")
+    private double sentinelValue;
+
     @ApiParam("客户代码")
     private String customerCode;
 
@@ -62,15 +66,22 @@ public class ProductBiModel {
     @ApiParam("x坐标内容")
     private List<String> xAxis;
 
+    @ApiParam("一些携带值 eg:异常类型，异常次数")
+    private Map<String, Object> carryMap;
+
     @ApiParam("图表显示的数据")
     private List<ProductBiSeriesModel> series;
 
+    @ApiParam("列名")
+    private Map<String, String> colMap;
+
+    @Deprecated
     public double getCompleteRate() {
-        if(this.planQty != 0) {
+        if (this.planQty != 0) {
-            this.CompleteRate = outputQty / planQty;
+            this.completeRate = outputQty / planQty;
         } else {
-            this.CompleteRate = 0;
+            this.completeRate = 0;
         }
-        return this.CompleteRate;
+        return this.completeRate;
     }
 }

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 

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

@@ -80,13 +80,19 @@ public class QcCheckDataModel {
     private String workCellName;
 
     @ApiParam("物料名称")
-    private String partNoName;
+    private String partName;
+
+    @ApiParam(value = "修改人")
+    private String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    private String modifyDatetime;
 
     public QcCheckDataModel() {
 
     }
 
-    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) {
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.organizeCode = organizeCode;
         this.createUser = createUser;
@@ -111,6 +117,8 @@ public class QcCheckDataModel {
         this.shiftGroupName = shiftGroupName;
         this.squadLeader = squadLeader;
         this.workCellName = workCellName;
-        this.partNoName = partNoName;
+        this.partName = partName;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfWmsPpm;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface IfWmsPpmRepository extends BaseRepository<IfWmsPpm, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandardCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:53
+ * @Modify:
+ **/
+public interface MesQualityStandardCfgRepository extends BaseRepository<MesQualityStandardCfg, Long> {
+}

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

@@ -414,7 +414,7 @@ public class MesHqlPack {
     /**
      * MES 开线管控
      *
-     * @param mesWcCheck
+     * @param wcCheck
      * @return
      */
     public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
@@ -1838,11 +1838,11 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
-            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
+            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) {
-            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
+            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
 //            DdlPreparedPack.timeBuilder(
 //                    mesProduceSn.getOutWorkCenterStartTime(),
 //                    mesProduceSn.getOutWorkCenterEndTime(),
@@ -2021,6 +2021,12 @@ public class MesHqlPack {
         if (mesProduceSnTravel.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
+            DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
+        }
+        if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
+            DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
+        }
         DdlPreparedPack.timeBuilder(
                 mesProduceSnTravel.getCreateDateTimeStart(),
                 mesProduceSnTravel.getCreateDateTimeEnd(),

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 作业流程导入Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/12/10 11:26
+ * @Modify
+ */
+@Data
+@Api("作业流程导入Model")
+public class WmsAgImportModel implements Serializable {
+    private static final long serialVersionUID = 5322363872992177667L;
+    @ApiParam("流程集合")
+    public List<WmsActionGroup> agList;
+    @ApiParam("流程明细集合")
+    List<WmsActionGroupDetails> agdList;
+    @ApiParam("步骤调用参数集合")
+    List<WmsActionStepCallParam> ascpList;
+    @ApiParam("作业步骤集合")
+    List<WmsActionStep> asList;
+    @ApiParam("作业步骤调用集合")
+    List<WmsActionStepCall> ascList;
+    @ApiParam("作业组件集合")
+    List<WmsActionModule> amList;
+    @ApiParam("作业组件参数集合")
+    List<WmsActionModuleParam> ampList;
+    @ApiParam("作业步骤参数类型集合")
+    List<WmsActionStepType> astList;
+    @ApiParam("工厂代码")
+    public String organizeCode;
+    @ApiParam("是否覆盖")
+    public Integer isConvert;
+    @ApiParam("用户名")
+    public String userName;
+}

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -29,45 +30,49 @@ import javax.persistence.*;
 public class WmsActionGroup extends BaseBean {
 
     private static final long serialVersionUID = -4169996695337717755L;
-    @Column(name = "AG_NAME_E")
+    @Column(name = "AG_NAME_E", columnDefinition = "varchar(225) default ''")
     @ApiParam("英文流程名称")
     private String agNameE;
 
-    @Column(name = "AG_DESC_E")
+    @Column(name = "AG_DESC_E", columnDefinition = "varchar(225) default ''")
     @ApiParam("英文流程描述")
     private String agDescE;
 
-    @Column(name = "AG_NAME_C")
+    @Column(name = "AG_NAME_C", nullable = false)
     @ApiParam("中文流程名称")
+    @AnnoOutputColumn
     private String agNameC;
 
-    @Column(name = "AG_DESC_C")
+    @Column(name = "AG_DESC_C", nullable = false)
     @ApiParam("中文流程描述")
+    @AnnoOutputColumn
     private String agDescC;
 
-    @Column(name = "INIT_AM_ID")
+    @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0")
     @ApiParam(value = "初始化组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long initAmId;
 
-    @Column(name = "DETAILS_AM_ID")
+    @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0")
     @ApiParam(value = "明细处理组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long detailsAmId;
 
-    @Column(name = "END_AM_ID")
+    @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0")
     @ApiParam(value = "结束组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long endAmId;
 
     // 1=true, 2 = false
-    @Column(name = "AUTO_INIT")
+    @Column(name = "AUTO_INIT", nullable = false)
     @ApiParam(value = "任务自动初始化", example = "0")
+    @AnnoOutputColumn
     private Integer autoInit;
 
     // 1=true, 2 = false
-    @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false)
+    @Column(name = "IS_COMMIT_REF_MOVE", nullable = false)
     @ApiParam(value = "是否连带提交创建状态移动单", example = "2")
+    @AnnoOutputColumn
     private Integer isCommitRefMove;
 
     @Lob

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -32,98 +33,107 @@ import javax.persistence.Transient;
 public class WmsActionGroupDetails extends BaseBean {
 
     private static final long serialVersionUID = 544189352378073377L;
-    @Column(name = "AG_ID")
+    @Column(name = "AG_ID", nullable = false)
     @ApiParam(value = "作业流程ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long agId;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", nullable = false)
     @ApiParam(value = "序号", example = "0")
+    @AnnoOutputColumn
     private Integer seq;
 
-    @Column(name = "OK_SEQ")
+    @Column(name = "OK_SEQ",  nullable = false)
     @ApiParam(value = "成功跳转步骤", example = "0")
+    @AnnoOutputColumn
     private Integer okSeq;
 
-    @Column(name = "NG_SEQ")
+    @Column(name = "NG_SEQ",nullable = false)
     @ApiParam(value = "失败跳转步骤", example = "0")
+    @AnnoOutputColumn
     private Integer ngSeq;
 
-    @Column(name = "VALUE_TYPE")
+    @Column(name = "VALUE_TYPE",  nullable = false)
     @ApiParam(value = "动作类型", example = "10")
+    @AnnoOutputColumn
     private Integer valueType;
 
-    @Column(name = "TO_UPPER")
+    @Column(name = "TO_UPPER", nullable = false)
     @ApiParam(value = "是否转为大写", example = "2")
+    @AnnoOutputColumn
     private Integer toUpper;
 
-    @Column(name = "LEN_CHECK")
+    @Column(name = "LEN_CHECK", columnDefinition = "int default 0")
     @ApiParam(value = "长度检查", example = "0")
     private Integer lenCheck;
 
-    @Column(name = "REGULAR_CHECK")
+    @Column(name = "REGULAR_CHECK", columnDefinition = "varchar(1000) default ''")
     @ApiParam(value = "正则校验")
     private String regularCheck;
 
-    @Column(name = "REGULAR_CHECK_FAIL_MSG")
+    @Column(name = "REGULAR_CHECK_FAIL_MSG", columnDefinition = "varchar(1000) default ''")
     @ApiParam(value = "正则校验失败提示")
     private String regularCheckFailMsg;
 
-    @Column(name = "AS_ID")
+    @Column(name = "AS_ID", nullable = false)
-    @ApiParam(value = "作业步骤", example = "0")
+    @ApiParam(value = "作业步骤")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long asId;
 
-    @Column(name = "AT_ID")
+    @Column(name = "AT_ID",  nullable = false)
-    @ApiParam(value = "步骤类型编号", example = "0")
+    @ApiParam(value = "步骤类型编号")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long atId;
 
-    @Transient
+    @Column(name = "GOTO_BTN_CODE", columnDefinition = "varchar(225) default ''")
-    @ApiParam(value = "作业步骤名称")
-    private String asName;
-
-    @Transient
-    @ApiParam(value = "步骤类型名称")
-    private String atName;
-
-    @Transient
-    @ApiParam(value = "流程名称")
-    private String agName;
-
-    @Column(name = "GOTO_BTN_CODE")
     @ApiParam(value = "跳转按钮代码")
     private String goToBtnCode;
 
-    @Column(name = "GOTO_BTN_NAME")
+    @Column(name = "GOTO_BTN_NAME", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "跳转按钮名称")
     private String goToBtnName;
 
-    @Column(name = "PRE_SHOW")
+    @Column(name = "PRE_SHOW", columnDefinition = "int default 0")
-    @ApiParam(value = "是否预显示", example = "1")
+    @ApiParam(value = "是否预显示")
     private Integer preShow;
 
-    @Column(name = "SHOW_AM_ID")
+    @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0")
-    @ApiParam(value = "回显组件方法ID", example = "1")
+    @ApiParam(value = "回显组件方法ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long showAmId;
 
-    @Column(name = "IS_COMMIT_ABLE")
+    @Column(name = "IS_COMMIT_ABLE",  nullable = false)
-    @ApiParam(value = "是否可提交", example = "2")
+    @ApiParam(value = "是否可提交")
+    @AnnoOutputColumn
     private Integer isCommitAble;
 
-    @Column(name = "IS_AUTO_OPEN_WINDOW")
+    @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false)
-    @ApiParam(value = "是否自动开窗", example = "2")
+    @ApiParam(value = "是否自动开窗")
     private Integer isAutoOpenWindow;
 
-    @Column(name = "SEARCH_KEY")
+    @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "搜索KEY")
     private String searchKey;
 
-    @Column(name = "GROUP_KEY")
+    @Column(name = "GROUP_KEY", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "分组KEY")
     private String groupKey;
 
+    @Transient
+    @ApiParam(value = "作业步骤名称")
+    private String asName;
+
+    @Transient
+    @ApiParam(value = "步骤类型名称")
+    private String atName;
+
+    @Transient
+    @ApiParam(value = "流程名称")
+    private String agName;
+
     public int getSeqVal() {
         return this.seq == null ? 0 : this.seq;
     }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -29,31 +30,36 @@ import javax.persistence.Table;
 public class WmsActionModule extends BaseBean {
 
     private static final long serialVersionUID = 9117362998863937579L;
-    @Column(name = "AM_NAME")
+    @Column(name = "AM_NAME",nullable = false)
     @ApiParam("组件名称")
+    @AnnoOutputColumn
     public String amName;
 
-    @Column(name = "AM_DESC")
+    @Column(name = "AM_DESC",  nullable = false)
     @ApiParam("组件描述")
+    @AnnoOutputColumn
     public String amDesc;
 
-    @Column(name = "CALL_CLASS")
+    @Column(name = "CALL_CLASS",nullable = false)
     @ApiParam("实现类")
+    @AnnoOutputColumn
     public String callClass;
 
-    @Column(name = "AM_TYPE")
+    @Column(name = "AM_TYPE",  nullable = false)
-    @ApiParam(value = "组件类型", example = "0")
+    @ApiParam(value = "组件类型")
+    @AnnoOutputColumn
     public Integer amType;
 
-    @Column(name = "OP_TYPE_CODE")
+    @Column(name = "OP_TYPE_CODE", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "作业类型")
     public String opTypeCode;
 
-    @Column(name = "IS_SHOW_INFO")
+    @Column(name = "IS_SHOW_INFO", nullable = false)
-    @ApiParam(value = "是否实现回显", example = "0")
+    @ApiParam(value = "是否实现回显")
+    @AnnoOutputColumn
     public Integer isShowInfo;
 
-    @ApiParam(value = "作业类型名称", example = "0")
+    @ApiParam(value = "作业类型名称")
     public String opTypeName;
 
     public WmsActionModule() {

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -31,29 +32,34 @@ import javax.persistence.Table;
 public class WmsActionModuleParam extends BaseBean {
 
     private static final long serialVersionUID = 8099621042858629818L;
-    @Column(name = "AM_ID")
+    @Column(name = "AM_ID", nullable = false)
-    @ApiParam(value = "组件ID", example = "0")
+    @ApiParam(value = "组件ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     public Long amId;
 
-    @Column(name = "METHOD_NAME")
+    @Column(name = "METHOD_NAME", columnDefinition = "varchar(255) default ''")
     @ApiParam("组件执行方法名称")
+    @AnnoOutputColumn
     public String methodName;
 
-    @Column(name = "PARAM_CODE")
+    @Column(name = "PARAM_CODE", nullable = false)
     @ApiParam("参数编码")
+    @AnnoOutputColumn
     public String paramCode;
 
-    @Column(name = "PARAM_NAME")
+    @Column(name = "PARAM_NAME",  nullable = false)
     @ApiParam("参数名称")
+    @AnnoOutputColumn
     public String paramName;
 
-    @Column(name = "PARAM_VALUE_LIST")
+    @Column(name = "PARAM_VALUE_LIST", columnDefinition = "varchar(225) default ''")
     @ApiParam("参数可选值列表")
     public String paramValueList;
 
-    @Column(name = "PARAM_TYPE")
+    @Column(name = "PARAM_TYPE",nullable = false)
     @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0")
+    @AnnoOutputColumn
     public Integer paramType;
 
     public int getParamTypeVal() {

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -31,29 +32,33 @@ import javax.persistence.Table;
 public class WmsActionStep extends BaseBean {
 
     private static final long serialVersionUID = 6460096995982059959L;
-    @Column(name = "AS_NAME_E")
+    @Column(name = "AS_NAME_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型名称")
     private String asNameE;
 
-    @Column(name = "AS_DESC_E")
+    @Column(name = "AS_DESC_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型描述")
     private String asDescE;
 
-    @Column(name = "AS_NAME_C")
+    @Column(name = "AS_NAME_C", nullable = false)
     @ApiParam(value = "中文类型名称")
+    @AnnoOutputColumn
     private String asNameC;
 
-    @Column(name = "AS_DESC_C")
+    @Column(name = "AS_DESC_C", nullable = false)
     @ApiParam(value = "中文类型描述")
+    @AnnoOutputColumn
     private String asDescC;
 
-    @Column(name = "AT_NAME_C_RDD")
+    @Column(name = "AT_NAME_C_RDD",  nullable = false)
     @ApiParam(value = "步骤类型名称")
+    @AnnoOutputColumn
     private String atNameCRdd;
 
-    @Column(name = "AT_ID")
+    @Column(name = "AT_ID", nullable = false)
     @ApiParam(value = "步骤类型编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long atId;
 
     //get单独处理

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -33,18 +34,21 @@ import javax.persistence.*;
 public class WmsActionStepCall extends BaseBean {
 
     private static final long serialVersionUID = -6013283534745803464L;
-    @Column(name = "AS_ID")
+    @Column(name = "AS_ID",nullable = false)
     @ApiParam(value = "作业步骤ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     public Long asId;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ",nullable = false)
     @ApiParam(value = "序号", example = "0")
+    @AnnoOutputColumn
     public Integer seq;
 
-    @Column(name = "AM_ID")
+    @Column(name = "AM_ID", nullable = false)
     @ApiParam(value = "处理组件ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     public Long amId;
 
     @Transient
@@ -55,12 +59,14 @@ public class WmsActionStepCall extends BaseBean {
     @ApiParam(value = "组件描述")
     public String amDesc;
 
-    @Column(name = "AM_TYPE")
+    @Column(name = "AM_TYPE",nullable = false)
-    @ApiParam(value = "组件类型", example = "0")
+    @ApiParam(value = "组件类型")
+    @AnnoOutputColumn
     public Integer amType;
 
-    @Column(name = "OK_VALUE")
+    @Column(name = "OK_VALUE", nullable = false)
-    @ApiParam(value = "成功标志", example = "10")
+    @ApiParam(value = "成功标志")
+    @AnnoOutputColumn
     public Integer okValue;
 
     public int getAmTypeVal() {

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -32,25 +33,29 @@ import javax.persistence.Transient;
 public class WmsActionStepCallParam extends BaseBean {
 
     private static final long serialVersionUID = -2813779192436803301L;
-    @Column(name = "AGD_ID")
+    @Column(name = "AGD_ID", nullable = false)
     @ApiParam(value = "流程明细编号")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long agdId;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ",nullable = false)
     @ApiParam(value = "序号")
+    @AnnoOutputColumn
     private Integer seq;
 
-    @Column(name = "AM_ID")
+    @Column(name = "AM_ID", nullable = false)
     @ApiParam(value = "处理组件编号")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long amId;
 
-    @Column(name = "PARAM_CODE")
+    @Column(name = "PARAM_CODE",nullable = false)
     @ApiParam(value = "参数编码")
+    @AnnoOutputColumn
     private String paramCode;
 
-    @Column(name = "PARAM_VALUE")
+    @Column(name = "PARAM_VALUE", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "参数值")
     private String paramValue;
 

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -21,31 +22,34 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="WMS_ACTION_TYPE")
+@Table(name = "WMS_ACTION_TYPE")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="作业步骤类型信息",description = "作业步骤类型信息")
+@Api(value = "作业步骤类型信息", description = "作业步骤类型信息")
 public class WmsActionStepType extends BaseBean {
 
     private static final long serialVersionUID = -8019644718382990603L;
-    @Column(name = "AT_NAME_E")
+    @Column(name = "AT_NAME_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型名称")
     private String atNameE;
 
-    @Column(name = "AT_DESC_E")
+    @Column(name = "AT_DESC_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型描述")
     private String atDescE;
 
-    @Column(name = "AT_NAME_C")
+    @Column(name = "AT_NAME_C", nullable = false)
     @ApiParam(value = "中文类型名称")
+    @AnnoOutputColumn
     private String atNameC;
 
-    @Column(name = "AT_DESC_C")
+    @Column(name = "AT_DESC_C", nullable = false)
     @ApiParam(value = "中文类型描述")
+    @AnnoOutputColumn
     private String atDescC;
 
-    @Column(name = "FUN_CALL_NAME")
+    @Column(name = "FUN_CALL_NAME", nullable = false)
     @ApiParam(value = "方法调用名称")
+    @AnnoOutputColumn
     private String funCallName;
 }

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

@@ -159,7 +159,7 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     private List<String> orderNoList;
 
-    @Column(name = "DOCK")
+    @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
     @ApiParam("道口")
     public String dock;
 

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

@@ -0,0 +1,157 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS_拉动计划任务明细表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-10 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PULL_TASK_DETAILS")
+@Api("WMS_拉动计划任务明细表")
+public class WmsPullTaskDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592736L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="ITEM")
+    @ApiParam(value = "行号", example = "0")
+    private Integer item = 0;
+
+    @Column(name="TERMINAL_NO")
+    @ApiParam("工位代码")
+    private String terminalNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位代码")
+    private String locateNo;
+
+    @Column(name="LOCATE_CAPACITY")
+    @ApiParam("库位容量")
+    private String locateCapacity;
+
+    @Column(name="PART_NO")
+    @ApiParam("零件编号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name="PLAN_PACK_COUNT")
+    @ApiParam(value = "计划容器数", example = "0")
+    private Integer planPackCount = 0;
+
+    @Column(name="FIRST_BATCH_QTY")
+    @ApiParam(value = "首批批量", example = "0")
+    private Integer firstBatchQty = 0;
+
+    @Column(name="FIRST_PACK_COUNT")
+    @ApiParam(value = "首批容器数", example = "0")
+    private Integer firstPackCount = 0;
+
+    @Column(name="REQUEST_QTY")
+    @ApiParam(value = "补货批量", example = "0")
+    private Integer requestQty = 0;
+
+    @Column(name="REQUEST_PACK_COUNT")
+    @ApiParam(value = "补货容器数", example = "0")
+    private Integer requestPackCount = 0;
+
+    @Column(name="REQUEST_LOT_NO")
+    @ApiParam(value = "补货批次", example = "0")
+    private Integer requestLotNo = 0;
+
+    @Column(name="REQUEST_TOTAL_COUNT")
+    @ApiParam(value = "补货累加次数", example = "0")
+    private Integer requestTotalCount = 0;
+
+    @Column(name="LAST_REQUEST_TIME")
+    @ApiParam("上一次补货时间")
+    private String lastRequestTtime;
+
+    @Column(name="BOOT_QTY")
+    @ApiParam(value = "尾箱批量", example = "0")
+    private Integer bootQty = 0;
+
+    @Column(name="BOOT_PACK_COUNT")
+    @ApiParam(value = "尾箱容器数", example = "0")
+    private Integer bootPackCount = 0;
+
+    @Column(name="BOOT_LOT_NO")
+    @ApiParam(value = "尾箱批次", example = "0")
+    private Integer bootLotNo = 0;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "单据状态", example = "0")
+    private Integer orderStatus = 0;
+
+    public Integer getOrderStatus() {
+        return orderStatus == null ? 0 : this.orderStatus.intValue();
+    }
+
+    public Integer getBootLotNo() {
+        return bootLotNo == null ? 0 : this.bootLotNo.intValue();
+    }
+
+    public Integer getBootPackCount() {
+        return bootPackCount == null ? 0 : this.bootPackCount.intValue();
+    }
+
+    public Integer getBootQty() {
+        return bootQty == null ? 0 : this.bootQty.intValue();
+    }
+
+    public Integer getRequestTotalCount() {
+        return requestTotalCount == null ? 0 : this.requestTotalCount.intValue();
+    }
+
+    public Integer getRequestLotNo() {
+        return requestLotNo == null ? 0 : this.requestLotNo.intValue();
+    }
+
+    public Integer getRequestPackCount() {
+        return requestPackCount == null ? 0 : this.requestPackCount.intValue();
+    }
+
+    public Integer getRequestQty() {
+        return requestQty == null ? 0 : this.requestQty.intValue();
+    }
+
+    public Integer getFirstPackCount() {
+        return firstPackCount == null ? 0 : this.firstPackCount.intValue();
+    }
+
+    public Integer getFirstBatchQty() {
+        return firstBatchQty == null ? 0 : this.firstBatchQty.intValue();
+    }
+
+    public Integer getPlanPackCount() {
+        return planPackCount == null ? 0 : this.planPackCount.intValue();
+    }
+
+    public Integer getItem() {
+        return item == null ? 0 : this.item.intValue();
+    }
+
+}

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS_拉动计划任务主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PULL_TASK_MASTER")
+@Api("WMS_拉动计划任务主表")
+public class WmsPullTaskMaster extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592736L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+
+    @Column(name="PLAN_PRODUCT_TIME")
+    @ApiParam("生产日期")
+    private String planProductTime;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次代码")
+    private String shitNo;
+
+    @Column(name="START_PRODUCT_TIME")
+    @ApiParam("开始生产时间")
+    private String startProductTime;
+
+    @Column(name="END_PRODUCT_TIME")
+    @ApiParam("结束生产时间")
+    private String endProductTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "单据状态", example = "0")
+    private Integer orderStatus = 0;
+
+    public Integer getOrderStatus() {
+        return orderStatus == null ? 0 : this.orderStatus.intValue();
+    }
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :wms拉动计划明细表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-11 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsPullTaskDetailsRepository extends BaseRepository<WmsPullTaskDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :wms拉动计划主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-11 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsPullTaskMasterRepository extends BaseRepository<WmsPullTaskMaster, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -6,18 +6,14 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1204,6 +1200,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
         DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        //单据状态
+        DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderStatus(), "orderStatus", result);
 
         getStringBuilderPack(wmsQCMaster, result);