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

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

@@ -556,6 +556,9 @@ public class AndonHqlPack {
         if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesEquipment.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
         }

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

@@ -218,6 +218,17 @@ public class ImppEnumUtil {
             return tmp;
         }
 
+
+        public static LOG_LEVEL valueOf(int val) {
+            LOG_LEVEL tmp = ERROR;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

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

@@ -769,10 +769,10 @@ public class WmsEnumUtil {
         QUARANTINE(340, "QUARANTINE", "隔离"),
         BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"),
         DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"),
-        RETURN(370, "RETURN", "KT退货"),
+        RETURN(370, "RETURN", "退货"),
-        REWORK(380, "KT_REWORK", "KT返工"),
+        REWORK(380, "REWORK", "返工"),
-        MISCALCULATION(390, "MISCALCULATION", "KT误判"),
+        MISCALCULATION(390, "MISCALCULATION", "误判"),
-        SORTING(400, "SORTING", "KT分选"),
+        SORTING(400, "SORTING", "分选"),
         VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
         VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
         DEFINITE(430, "DEFINITE", "合格"),

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

@@ -31,11 +31,11 @@ import java.io.Serializable;
 public class MesWorkOrderLog extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5859382100462830988L;
 
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("工单号")
     private String orderNo;
 
-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
     @ApiParam("物料号")
     private String partNo;
 
@@ -154,7 +154,7 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @Lob
     @Column(name = "EXTEND")
     @ApiParam("扩展数据")
-    private String extend;
+    public String extend;
 
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
@@ -172,6 +172,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("预留字段4")
     private String reserved4;
 
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

@@ -54,4 +54,7 @@ public class MesElectricDataModel implements Serializable {
 
     @ApiParam(value = "FTP文件")
     private Object ftpFile;
+
+    @ApiParam(value = "过程条码")
+    private String serialNumber;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -9,7 +11,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -139,4 +140,14 @@ public class SysTaskPlan extends BaseBean {
         }
         return taskPlanStatus.intValue();
     }
+
+    // 枚举 ImppEnumUtil.MESSAGE_TYPE
+    @Column(name = "LOG_LEVEL")
+    @ApiParam(value = "日志等级")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class)
+    private Integer logLevel;
+
+    public int getLogLevelVal() {
+        return logLevel == null ? ImppEnumUtil.LOG_LEVEL.ERROR.getValue() : logLevel;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -467,15 +467,13 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd",
+        DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", ddlPackBean);
-                ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd",
+        DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, false, false);
-                ddlPackBean);
-        DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean,
-                false, false);
         DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean);
 
         DdlPreparedPack.getOrderDefault(message);