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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -11,7 +11,6 @@ import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
 import com.thoughtworks.xstream.io.xml.XppDomDriver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.io.Writer;
 import java.lang.reflect.Field;
 

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

@@ -116,13 +116,14 @@ public class BlockSoftSwitchEnumUtil {
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
 //        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
         CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
+        CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
 
         /* Restful */
         CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"),
-        SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"),
+        SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,220001,"Client REST服务端适配器"),
 
         /* Socket */
         SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
@@ -216,7 +217,10 @@ public class BlockSoftSwitchEnumUtil {
         SCHEDULE(2,"定时调度"),
         RABBITMQ(3,"MQ 调用"),
         HTTP(4,"接口调用"),
-        CLOUD(5,"Cloud调用");
+        CLOUD(5,"Cloud调用"),
+        REST(6,"REST调用"),
+        WEB_SERVICE(7,"WebService"),
+        SOCKET(8,"socket");
 
         private int value;
         private String description;

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

@@ -3701,5 +3701,111 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 物流规则 处理模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_RULE_TYPE {
+    	PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
+    	REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTING_RULE_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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        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;
+        }
+    }
+    /**
+     * 物流规则 处理单位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_DELAY_UNIT {
+    	M(10, "M", "分"),
+        D(20, "D", "天");
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTING_DELAY_UNIT(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        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;
+        }
+    }
 
 }

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

@@ -11,6 +11,8 @@ 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:
@@ -46,7 +48,7 @@ public class MesQcCheckData extends BaseBean {
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测类型")
-    private String checkType;
+    private Integer checkType;
 
     @Column(name = "CHECK_ITEM")
     @ApiParam("检测项")
@@ -92,4 +94,8 @@ public class MesQcCheckData extends BaseBean {
     @ApiParam("客户代码")
     private String custCode;
 
+    @Transient
+    @ApiParam("过程质量检测数据")
+    private List<MesQcCheckStandard> mesQcCheckStandardList;
+
 }

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

@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 14:46
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_QC_CHECK_STANDARD")
+@Api("质量检测标准")
+public class MesQcCheckStandard extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @Column(name = "CHECK_STANDARD")
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @Column(name = "CHECK_GUIDE")
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Transient
+    @ApiParam("检测结果")
+    private String checkResult;
+
+    @Transient
+    @ApiParam("检测值")
+    private String checkValue;
+
+}

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

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

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

@@ -65,9 +65,9 @@ public class MesPlc extends BaseBean {
     @ApiParam("分组名称")
     private String groupName;
 
-    @Column(name = "EQU_CODE")
+    @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
-    private String equCode;
+    private String equipmentCode;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
@@ -77,10 +77,6 @@ public class MesPlc extends BaseBean {
     @ApiParam("工作单元")
     private String workCellCode;
 
-    @Column(name = "ENABLED")
-    @ApiParam("是否启用 0 false 1 true")
-    private Integer enabled;
-
     @Column(name = "PLC_CFG")
     @ApiParam("PLC的值的设定")
     private String plcCfg;

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

@@ -1277,9 +1277,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
         }
-        if (!StringUtils.isEmpty(mesPlc.getEquCode())) {
-            DdlPreparedPack.getStringEqualPack(mesPlc.getEquCode(), "equCode", packBean);
-        }
         if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
         }
@@ -1300,18 +1297,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesDatasource.getDsCode())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesDatasource.getDsName())) {
-            DdlPreparedPack.getStringEqualPack(mesDatasource.getDsName(), "dsName", packBean);
-        }
         if (!StringUtils.isEmpty(mesDatasource.getDsType())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean);
         }
         if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean);
         }
-        if (!StringUtils.isEmpty(mesDatasource.getEquipmentCode())) {
-            DdlPreparedPack.getStringEqualPack(mesDatasource.getEquipmentCode(), "equCode", packBean);
-        }
         return packBean;
     }
 
@@ -1329,6 +1320,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
         }
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
+        }
         if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
         }
@@ -1349,6 +1346,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
         }
+        if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
+        }
         if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
         }
@@ -1369,6 +1372,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
         }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
+        }
         if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
         }
@@ -1389,6 +1398,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
         }
@@ -1400,5 +1415,4 @@ public class MesHqlPack {
         }
         return packBean;
     }
-
 }

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

@@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -42,7 +42,7 @@ public class SuitClientModel {
     /**
      * 适配记录
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitRecord bsSuitRecord;
 
     /**

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

@@ -29,8 +29,11 @@ public class SuitParamModel {
     private String pathKey;
     /* 标签内容 */
     private String vaule;
-    /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
+    /**
-    private Integer type;  // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE
+     * 标签 内容 类型 暂未定义
+     * 设计思路： type 说明这个字段属于什么类型的值， 例如 Date,BigDecimal 等特殊类型标注
+     */
+    private String type;
 
     /* 标签属性 */
     private Map<String,String> attr;
@@ -38,4 +41,20 @@ public class SuitParamModel {
     private SuitParamModel parent;
     /* 标签子集 */
     private List<SuitParamModel> childList;
+
+    @Override
+    public String toString() {
+        return "SuitParamModel{" +
+                "tagName='" + tagName + '\'' +
+                ", classPath='" + classPath + '\'' +
+                ", methodName='" + methodName + '\'' +
+                ", id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", pathKey='" + pathKey + '\'' +
+                ", vaule='" + vaule + '\'' +
+                ", type=" + type +
+                ", attr=" + attr +
+                ", childList=" + childList +
+                '}';
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,43 +42,43 @@ public class SuitServerModel {
     /**
      * 适配结果信息
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private String suitMessage;
 
     /**
      * 适配状态码
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
 
     /**
      * 适配结果
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private boolean suitSuccess = true;
 
     /**
      * 适配记录
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitRecord bsSuitRecord;
 
     /**
      * 适配器信息
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitCaseModel bsSuitCaseModel;
 
     /**
      * 请求来源
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private Integer requestSource;
 
     /**
      * 适配方式
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private Integer suitMethodId;
 
     public int getSuitMethodIdVal(){
@@ -87,6 +88,6 @@ public class SuitServerModel {
         return suitMethodId.intValue();
     }
 
-    @XStreamImplicit
+//    @XStreamImplicit
     private String analyzeMessage;
 }

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

@@ -104,12 +104,15 @@ public class BsSuitCase extends BaseBean {
         return isNeedCertification.intValue();
     }
 
+    @Column(name = "IS_PUSH_MQ")
+    @ApiParam(value = "是否推送MQ")
+    private Integer isPushMQ;
+
     @Column(name = "SSL_KEY_ID")
     @ApiParam(value = "证书id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long sslKeyId;
 
-
     @Column(name = "SUIT_DATA_TYPE")
     @ApiParam(value = "适配报文类型")
     private Integer suitDataType;

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

@@ -41,12 +41,16 @@ public class BsSuitFile extends BaseBean {
 
     @Column(name = "SUIT_CASE_NAME_RDD")
     @ApiParam(value = "适配套件名称")
-    private String suitCaseName;
+    private String suitCaseNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配套件代码")
     private String suitCaseCode;
 
+    @Column(name = "CASE_TYPE_ID")
+    @ApiParam(value = "套件类型id(枚举)")
+    private Integer caseTypeId;
+
     @Column(name = "FOLDER_PATH")
     @ApiParam(value = "文件夹路径")
     private String folderPath;

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

@@ -36,9 +36,9 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配套件名称")
     private String suitCaseNameRdd;
 
-    @Column(name = "SUIT_CASE_CODE_RDD")
+    @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配套件代码")
-    private String suitCaseCodeRdd;
+    private String suitCaseCode;
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配器套件id")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -333,7 +333,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
@@ -370,7 +370,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitCaseFile(BsSuitFile bsSuitFile){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseName(),"suitCaseName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean);

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -75,6 +77,7 @@ public class WmsASNMasterDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
     public Integer itemStatus;
 
     @Column(name = "PACKAGE")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -112,6 +114,7 @@ public class WmsPOMasterDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam("状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     private Integer itemStatus;
 
     @Column(name = "SNP", columnDefinition = "decimal(18,8)")

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

@@ -21,7 +21,6 @@ public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
      */
     WmsStockSn findFirstBySn(String sn);
 
-
     /**
      * Rock.Yu at 2019-06-22 11:05
      * 按照存储区代码查询最早批次的物料条码