Merge remote-tracking branch 'remotes/origin/dev' into test

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

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

@@ -231,7 +231,8 @@ public class BlockSoftSwitchEnumUtil {
         CLOUD(5,"Cloud调用"),
         REST(6,"REST调用"),
         WEB_SERVICE(7,"WebService"),
-        SOCKET(8,"socket");
+        SOCKET(8,"socket"),
+        RETRY(9,"重试");
 
         private int value;
         private String description;

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

@@ -245,12 +245,12 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static int descOf(boolean desc) {
+        public static int boolOfOfVal(boolean boolVal) {
-            return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
+            return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
-        public static int descOf(int desc) {
+        public static int intOfVal(int boolIntVal) {
-            return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
+            return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
         public static TRUE_OR_FALSE valueOfEnum(int value){

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

@@ -7479,7 +7479,8 @@ public class WmsEnumUtil {
         PICK(40, "REPAIR", "挑选"),
         REPAIR(50, "REPAIR", "返修"),
         BIND(60, "BIND", "绑定"),
-        OUTSTOCK(70, "OUTSTOCK", "出库");
+        OUTSTOCK(70, "OUTSTOCK", "出库"),
+        RE_PACKING(80, "RE_PACKING", "重绑");
         private int value;
         private String code;
         private String description;

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

@@ -39,6 +39,17 @@ public class SuitClientModel implements Serializable {
     private Integer actionId;
 
     /**
+     * 调用方自定义标识
+     */
+    @XStreamAsAttribute
+    private String suitSid;
+
+    /**
+     * 重试记录id
+     */
+    private Long retryRecordId;
+
+    /**
      * 适配器信息
      */
     private BsSuitCaseModel suitCaseModel;
@@ -142,4 +153,23 @@ public class SuitClientModel implements Serializable {
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
     }
+
+    public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) {
+        this.requestSource = suitModel.getRequestSource();
+        this.suitSid = suitModel.getSuitSid();
+        this.retryRecordId = suitModel.getRetryRecordId();
+
+        this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
+        this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
+        this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
+        this.suitCaseModel = suitCaseModel;
+
+        // 设置默认
+        this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+        // 设置默认
+        this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+        // 设置默认
+        this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+    }
+
 }

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :
+ *      软适配执行适配器(客户端服务端适配总入口)
+ *      所需的参数模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-10-28 15:51
+ * @Modify:
+ **/
+@Data
+public class SuitModel implements Serializable {
+
+    private static final long serialVersionUID = 8981933192688480221L;
+
+    @ApiParam(value = "适配器代码")
+    private String suitCaseCode;
+
+    @ApiParam(value = "适配SID")
+    private String suitSid;
+
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REQUEST_SOURCE.class)
+    @ApiParam(value = "适配来源")
+    private Integer requestSource;
+
+    @ApiParam(value = "重试记录id")
+    private Long retryRecordId;
+
+    @ApiParam(value = "适配器参数XML")
+    private String paramXml;
+
+    @ApiParam(value = "适配器参数")
+    private List<BsSuitCaseParam> bsSuitCaseParamList;
+
+}

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import io.swagger.annotations.ApiModel;
@@ -23,6 +24,9 @@ public class SuitRecordModel {
     @ApiModelProperty("适配文件")
     private BsSuitFile bsSuitFile;
 
+    @ApiModelProperty("分页信息")
+    private Pager pager;
+
     public SuitRecordModel() {
     }
 

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

@@ -39,6 +39,13 @@ public class SuitServerModel implements Serializable {
 
     // 请求ID
     private String requestId;
+
+    // 调用方自定义标识
+    private String suitSid;
+
+    // 重试记录id
+    private Long retryRecordId;
+
     // 传输单对象
     @XmlElement(name = "data")
     @XStreamAlias("data")
@@ -110,4 +117,14 @@ public class SuitServerModel implements Serializable {
 
     //    @XStreamImplicit
     private String analyzeMessage;
+
+    public SuitServerModel(){
+    }
+    public SuitServerModel(SuitModel suitModel){
+        this.suitCaseCode = suitModel.getSuitCaseCode();
+        this.requestSource = suitModel.getRequestSource();
+        this.suitSid= suitModel.getSuitSid();
+        this.retryRecordId = suitModel.getRetryRecordId();
+        this.obj = suitModel.getParamXml();
+    }
 }

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

@@ -61,6 +61,15 @@ public class BsSuitRecord extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseDetailId;
 
+    @Column(name = "SUIT_SID")
+    @ApiParam(value = "适配记录SID")
+    private String suitSid;
+
+    @Column(name = "RETRY_RECORD_ID")
+    @ApiParam(value = "重试记录id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long retryRecordId;
+
     @Column(name = "SUIT_METHOD_ID")
     @ApiParam(value = "适配方式id枚举（定时适配，主动适配）")
     private Integer suitMethodId;

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

@@ -320,6 +320,7 @@ public class SoftSwitchHqlPack {
 
         DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);

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

@@ -286,8 +286,8 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号")
     public String partNo;
 
-    @ApiParam(value = "标题")
     @Transient
+    @ApiParam(value = "标题")
     public String title;
 
     @Transient
@@ -354,6 +354,9 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
+    @Transient
+    @ApiParam("查询状态集合")
+    public List<Integer> orderStatusList;
 
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;

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

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 库位物料表
@@ -87,6 +88,26 @@ public class WmsLocatePart extends BaseBean {
     @ApiParam("库位类型")
     private Integer locateType;
 
+    @Transient
+    @ApiParam("库位类型")
+    private List<Integer> locateTypeList;
+
+    @Transient
+    @ApiParam("物料类型")
+    private List<String> partTypeList;
+
+    @Transient
+    @ApiParam(value = "存储区")
+    private String zoneNo;
+
+    @Transient
+    @ApiParam(value = "仓库")
+    private String whNo;
+
+    @Transient
+    @ApiParam(value = "库存单位")
+    private String stockUnit;
+
     public Double getMin() {
         return this.min == null ? 0 : this.min;
     }
@@ -107,5 +128,23 @@ public class WmsLocatePart extends BaseBean {
         return this.min ==null?0:this.min.doubleValue();
     }
 
+    public WmsLocatePart() {
+    }
 
+    public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double min,
+                         Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo,
+                         String stockUnit) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.pullQty = pullQty;
+        this.max = max;
+        this.min = min;
+        this.isGeneratePicklist = isGeneratePicklist;
+        this.safetyStock = safetyStock;
+        this.moq = moq;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.stockUnit = stockUnit;
+    }
 }

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

@@ -36,7 +36,7 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name = "BATCH_NO")
     @ApiParam(value = "BATCH号")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String batchNo;
 
     @Column(name="SERIAL_SN")
@@ -47,7 +47,7 @@ public class WmsSerialSnTrans extends BaseBean {
     @Column(name="BH_TYPE")
     @ApiParam("BH类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
     private Integer bhType;
 
     @Column(name = "PART_NO")
@@ -77,15 +77,26 @@ public class WmsSerialSnTrans extends BaseBean {
     @Column(name="TRANS_TYPE")
     @ApiParam("操作类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class)
     private Integer transType;
 
     @Column(name = "IS_OK")
     @ApiParam(value = "是否合格")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE", isRequire = 2)
     private Integer isOk;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lotNo;
+
+    @Column(name = "STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_DETAILS_STATUS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_DETAILS_STATUS.class)
+    @ApiParam("状态")
+    private Integer status;
+
     @Transient
     @ApiParam("操作类型")
     private List<Integer> transTypeLst;