Merge branch 'dev' into test

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

@@ -20,12 +20,12 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CASE_TYPE{
-        SOCKET(10,"SOCKET"),
+        SOCKET(10,"SOCKET套件"),
-        RESTFUL(20,"RESTFUL"),
+        RESTFUL(20,"RESTFUL套件"),
-        DATASOURCE(30,"数据源"),
+        DATASOURCE(30,"数据源套件"),
-        WEB_SERVICE(40,"WebService"),
+        WEB_SERVICE(40,"WebService套件"),
-        MQ(50,"消息队列"),
+        MQ(50,"消息队列套件"),
-        WEB_SOCKET(60,"WebSocket");
+        WEB_SOCKET(60,"WebSocket套件");
 
         private int value;
         private String description;

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

@@ -459,6 +459,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

@@ -422,6 +422,15 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static LOCATE_TYPE codeOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

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

@@ -88,7 +88,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")

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

@@ -95,6 +95,10 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     /**********************  冗余字段 *********************************/
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -102,7 +102,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入异常结果model")
+public class MesPlanOrderExcelErrorModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入结果model")
+public class MesPlanOrderExcelResultModel implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功数量")
+    private int successNum;
+
+    @ApiParam("失败数量")
+    private int errorNum;
+
+    @ApiParam("错误信息集合")
+    private List<MesPlanOrderExcelErrorModel> mesPlanOrderExcelErrorModel;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+}

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

@@ -77,6 +77,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
+        if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean);
+        }
 
         // 时间段查询
         DdlPreparedPack.timeBuilder(

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

@@ -1,16 +1,14 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 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 io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import java.util.HashMap;
-
 /**
  * @Description :
  * @Reference :
@@ -41,6 +39,11 @@ public class SuitClientModel {
     private BsSuitCaseModel suitCaseModel;
 
     /**
+     * 适配记录
+     */
+    private BsSuitRecord bsSuitRecord;
+
+    /**
      * 适配结果信息
      */
     private String suitMessage;
@@ -53,6 +56,13 @@ public class SuitClientModel {
      * 适配方式
      */
     private Integer suitMethodId;
+
+    public int getSuitMethodIdVal(){
+        if(suitMethodId == null){
+            return -1;
+        }
+        return suitMethodId.intValue();
+    }
     /**
      * 适配状态码
      */
@@ -97,4 +107,21 @@ public class SuitClientModel {
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
     }
+
+    public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) {
+        this.requestSource = requestSource;
+        this.suitMethodId = suitMethodId;
+
+        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-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -108,22 +108,96 @@ public class BsSuitCase extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long sslKeyId;
 
-    @Column(name = "TIMING_SUIT_NUM")
+    @Column(name = "REGULAR_SUIT_NUM")
     @ApiParam(value = "定时适配次数")
-    private Integer timingSuitNum;
+    private Integer regularSuitNum;
+
+    public int getRegularSuitNumVal(){
+        if(regularSuitNum == null){
+            return -1;
+        }
+        return regularSuitNum.intValue();
+    }
+
+    public int addRegularSuitNum(){
+        if(regularSuitNum == null){
+            return 0;
+        }
+        return ++regularSuitNum;
+    }
 
     @Column(name = "INITIATIVE_SUIT_NUM")
     @ApiParam(value = "主动适配测试")
     private Integer initiativeSuitNum;
 
+    public int getInitiativeSuitNumVal(){
+        if(initiativeSuitNum == null){
+            return -1;
+        }
+        return initiativeSuitNum.intValue();
+    }
+
+    public int addInitiativeSuitNum(){
+        if(initiativeSuitNum == null){
+            initiativeSuitNum = 0;
+        }
+        return ++regularSuitNum;
+    }
+
     @Column(name = "SUCCESS_NUM")
     @ApiParam(value = "成功次数")
     private Integer successNum;
 
+    public int getSuccessNumVal(){
+        if(successNum == null){
+            successNum = -1;
+        }
+        return successNum.intValue();
+    }
+
+    public int addSuccessNum(){
+        if(successNum == null){
+            successNum = 0;
+        }
+        return ++successNum;
+    }
+
     @Column(name = "FAIL_NUM")
     @ApiParam(value = "失败次数")
     private Integer failNum;
 
+    public int getFailNumVal(){
+        if(failNum == null){
+            return -1;
+        }
+        return failNum;
+    }
+
+    public int addFailNum(){
+        if(failNum == null){
+            failNum =0;
+        }
+        return ++failNum;
+    }
+
+    @Column(name = "COUNT_NUM")
+    @ApiParam(value = "总次数")
+    private Integer countNum;
+
+    public int getCountNumVal(){
+        if(countNum == null){
+            countNum = -1;
+        }
+        return countNum.intValue();
+    }
+
+    public int addCountNum(){
+        if(countNum == null){
+            countNum = 0;
+        }
+        return ++countNum;
+    }
+
     @Column(name = "SUIT_CASE_DESCRIPTION")
     @ApiParam(value = "适配器描述")
     private String suitCaseDescription;

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

@@ -42,6 +42,15 @@ public class BsSuitDataDetail extends BaseBean {
     @ApiParam(value = "适配套件代码")
     private String suitCaseCodeRdd;
 
+    @Column(name = "SUIT_TYPE_ID")
+    @ApiParam(value = "适配类型id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitTypeId;
+
+    @Column(name = "CASE_TYPE_ID")
+    @ApiParam(value = "套件类型id(枚举)")
+    private Integer caseTypeId;
+
     @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
     private String suitTypeNameRdd;

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

@@ -12,6 +12,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 : 适配记录
@@ -105,5 +107,17 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    @Transient
+    @ApiParam(value = "适配记录参数")
+    private List<BsSuitRecordParam> bsSuitRecordParamList;
+
+    @Transient
+    @ApiParam(value = "适配记录报文")
+    private BsSuitDataDetail bsSuitDataDetail;
+
+    @Transient
+    @ApiParam(value = "适配请求记录")
+    private BsSuitRequestRecord bsSuitRequestRecord;
+
 }
 

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

@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.softswitch.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.softswitch.bean.*;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description :
@@ -101,7 +103,7 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -276,6 +278,10 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(),"operateName",ddlPackBean);
 
+        bsSuitCaseDataSourceTable.setOrderByParam("operateSort");
+        bsSuitCaseDataSourceTable.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
+        ddlPackBean.setOrderByStr(bsSuitCaseDataSourceTable.orderBy());
+
         return ddlPackBean;
     }
 
@@ -287,7 +293,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlCheckBsSuitCaseDataSourceTableOnly(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean);
 
@@ -332,8 +338,9 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);

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

@@ -102,10 +102,21 @@ public class WmsLocate extends BaseBean {
     @Transient
     private String factory;
 
+    @Transient
+    @ApiParam(value = "入库箱数", example = "-1")
+    private Integer destBoxQty;
+
     @Column(name = "ENCRYPTION_NO")
     @ApiParam(value = "加密编码")
     private String encryptionNo;
 
+    public WmsLocate() {
+    }
+    public WmsLocate(String locateNo,Integer destBoxQty) {
+        this.locateNo = locateNo;
+        this.destBoxQty = destBoxQty;
+    }
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }