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

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

@@ -5483,7 +5483,7 @@ public class MesEnumUtil {
         ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
         ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
         WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
-        EQU_OEE_DAY("EQU_OEE_Day", "设备OEE(天)");
+        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)");
 
         private String value;
         private String description;

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

@@ -6611,4 +6611,61 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+
+    /**
+     * 返修、挑选状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOM_TYPE {
+        INIT(10, "PART", "物料"),
+        BE_HANDLE(20, "OUT", "委外"),
+        FINISH(30, "UTENSIL", "器具");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BOM_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -93,6 +94,7 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -84,6 +85,7 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -96,6 +97,7 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -93,6 +94,7 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "ERROR_MESSAGE")
 	@ApiParam("异常消息")
+	@Lob
 	private String errorMessage;
 
 	@Column(name = "ACTION_CODE")

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -75,6 +76,7 @@ public class IfRawPartData  extends BaseBean implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -47,6 +48,7 @@ public class IfWmsPpm extends BaseBean implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE")
+@Table(name = "MES_OPERATE_OBJECT_CFG")
 @Api("MES_运算对象属性配置")
 public class MesOperateObjectCfg extends BaseBean implements Serializable {
 
@@ -62,4 +62,8 @@ public class MesOperateObjectCfg extends BaseBean implements Serializable {
     @Transient
     @ApiParam("属性名称")
     private String attributeName;
+
+    @Transient
+    @ApiParam("属性类型")
+    private Integer attributeType;
 }

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

@@ -62,7 +62,7 @@ public class MesPatternJis extends BaseBean implements Serializable {
 
     @Lob
     @Column(name = "MATCH_RULE")
-    @ApiParam("规则")
+    @ApiParam("匹配规则")
     private String matchRule;
 
 }

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

@@ -26,10 +26,10 @@ public class MesWorkOrderModel {
     @AnnoOutputColumn
     private String partNo;
 
-    //客户产线代码
+    //产线代码
     @ApiParam("ProductionLineID")
     @AnnoOutputColumn
-    private String custProdLineCode;
+    private String workCenterCode;
 
     //数量
     @ApiParam("DemandQty")

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -8,6 +8,10 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 import java.util.Map;
 
@@ -20,9 +24,12 @@ import java.util.Map;
  **/
 @Data
 @XStreamAlias("server")
+@XmlRootElement(name ="server")
+@XmlAccessorType(XmlAccessType.NONE)
 public class SuitServerModel {
 
     // 执行方法命令
+    @XmlElement
     @ApiParam(value = "适配器code")
     private String suitCaseCode;
     /* 认证使用 以后使用 */
@@ -31,6 +38,7 @@ public class SuitServerModel {
     // 请求ID
     private String requestId;
     // 传输单对象
+    @XmlElement(name = "data")
     private Object obj;
     // 传输集合
     private List list;
@@ -44,6 +52,7 @@ public class SuitServerModel {
      */
 //    @XStreamImplicit
     @XStreamCDATA
+    @XmlElement
     private String suitMessage;
 
     /**

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api(value = "长数据", description = "长数据")
 public class BsLongData extends BaseBean {
 
+    private static final long serialVersionUID = -329128754646765129L;
     @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
     private Long refId;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -40,6 +42,7 @@ public class BsSuitCaseREST extends BaseBean {
     //CommonEnumUtil.HTTP_METHOD_TYPE
     @Column(name = "REQUEST_METHOD_ID")
     @ApiParam(value = "请求方式id")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
     private Integer requestMethodId;
 
     @Transient

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

@@ -112,6 +112,14 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String terminalNo;
 
+
+    @Column(name = "BOM_TYPE")
+    @ApiParam(value = "BOM类型")
+    @ColumnDefault("10")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer bomType;
+
     @ApiParam(value = "目标存储区")
     @Transient
     public String destZoneNo;

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

@@ -115,6 +115,13 @@ public class WmsBomHistory extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String newBomVersion;
 
+    @Column(name = "BOM_TYPE")
+    @ApiParam(value = "BOM类型")
+    @ColumnDefault("10")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer bomType;
+
     @ApiParam(value = "目标存储区")
     @Transient
     public String destZoneNo;

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

@@ -10,7 +10,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 
@@ -71,7 +75,7 @@ public class WmsTransportRule extends BaseBean {
     public String partNo;
 
     @Column(name = "CUST_NO")
-    @ApiParam("客户代码")
+    @ApiParam("客户编号")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String custNo;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java

@@ -15,13 +15,7 @@ import lombok.Data;
 @Api("插件日志")
 public class ScriptLoggerModel {
     @ApiParam("工厂")
-    private String organizeCode;
+    private Boolean error;
-
-    @ApiParam("用户编号")
-    private String userCode;
-
-    @ApiParam("脚本编号")
-    private String scriptNo;
 
     @ApiParam("日志内容")
     private String context;

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

@@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
 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 cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
@@ -2279,6 +2280,14 @@ public class WmsHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean packHqlWmsScriptHistory(EngineScriptPersistenceHistory history) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(history.getScriptNo(), "scriptNo", packBean);
+        getStringBuilderPack(history, packBean);
+
+        return packBean;
+    }
+
     /**
      * 供应商窗口时间 条件封装
      *