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

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

@@ -228,7 +228,7 @@ public class BlockSoftSwitchEnumUtil {
         SCHEDULE(2,"定时调度"),
         RABBITMQ(3,"MQ 调用"),
         HTTP(4,"接口调用"),
-        CLOUD(5,"Cloud调用"),
+        CLOUD(5,"微服务调用"),
         REST(6,"REST调用"),
         WEB_SERVICE(7,"WebService"),
         SOCKET(8,"socket"),
@@ -1161,4 +1161,49 @@ public class BlockSoftSwitchEnumUtil {
 
     }
 
+    /**
+     * 适配重试方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SUIT_RETRY_STATUS {
+        NOT_RETRY(10, "未重试"),
+        RETRY(20, "已重试");
+
+        private int value;
+        private String description;
+
+        private BS_SUIT_RETRY_STATUS (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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 BS_SUIT_RETRY_STATUS valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
+
 }

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

@@ -3656,7 +3656,9 @@ public class MesEnumUtil {
     public enum QUEUE_ORDER_DETAIL_STATUS {
 
         NORMAL(10, "正常"),
-        CLOSE(20, "关闭");
+        CLOSE(20, "关闭"),
+        FINISH(30, "完成"),
+        OFF_LINE_REWORK(40, "线下返修");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -278,11 +278,15 @@ public class DdlPreparedPack {
     }
 
     /**
-     * 封装String对象成equal语句
-     *
+     * 不建议使用该方法，其他方法已满足需要
+     * @see #getStringLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
+     * @see #getStringLikerPackOr(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
+     * @see #getStringLeftLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
+     * @see #getStringRightLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
      * @param columnName 列名
      * @param packBean
      */
+    @Deprecated
     public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
             packBean.addColumnQuery(columnName, " and model." + columnName + " like  :m_" + columnName, val);

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

@@ -96,6 +96,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     private Integer alreadyLandedNum;
 
     @Transient
+    @ApiParam("当前库存")
+    private Integer currentStock;
+
+    @Transient
     @ApiParam("物料名称")
     private String partName;
 }

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

@@ -28,6 +28,12 @@ public class SkillsUserModel {
     @ApiParam(value ="工号")
     private String userEmpNo;
 
+    @ApiParam(value ="工位")
+    private String workCellCode;
+
+    @ApiParam(value ="产线")
+    private String workCenterCode;
+
     @ApiParam("技能矩阵信息")
     private List<MesUserSkill> mesUserSkillList;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -13,10 +14,12 @@ import java.util.List;
  * @Modify:
  */
 @Data
-public class BjBoardModel implements Serializable {
+public class MgnBjBoardModel implements Serializable {
 
     @ApiParam("jsa数量")
     private Integer jsaQty;
+    @ApiParam("jsa数量")
+    private Integer jsaRate;
     @ApiParam("完成数量")
     private Integer completeQty;
     @ApiParam("总数量")
@@ -36,6 +39,8 @@ public class BjBoardModel implements Serializable {
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 
+    private Map<String, Object> resultMap;
+
     @ApiParam("显示数据")
-    private List<BjBoardSeriesModel> seriesModels;
+    private List<MgnBjBoardSeriesModel> seriesModels;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java

@@ -10,7 +10,7 @@ import lombok.Data;
  * @Modify:
  */
 @Data
-public class BjBoardSeriesModel {
+public class MgnBjBoardSeriesModel {
     @ApiParam("名称")
     private String name;
     @ApiParam("显示数量")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Pn;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 
 import java.util.List;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;

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

@@ -241,10 +241,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
         }
         if (mesQueueOrder.getQueueType() != null) {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean);

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

@@ -3,12 +3,13 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 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;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "BS_SUIT_FILE")
-@Api(value = "适配文件信息", description = "适配文件信息")
+@ApiModel(value = "适配文件信息", description = "适配文件信息")
 public class BsSuitFile extends BaseBean {
 
     private static final long serialVersionUID = -5476684791619434327L;

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

@@ -5,10 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -34,7 +35,7 @@ import java.util.Map;
         @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"),
         @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"),
 })
-@Api(value = "适配记录", description = "适配记录")
+@ApiModel(value = "适配记录", description = "适配记录")
 public class BsSuitRecord extends BaseBean {
 
     private static final long serialVersionUID = 174969165955420968L;
@@ -157,6 +158,26 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "处理结果")
     private String processResult;
 
+    @ColumnDefault(value = "10")
+    @Column(name = "RETRY_STATUS")
+    @ApiParam(value = "重试状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.class)
+    private Integer retryStatus;
+
+    public String getRetryStatusTxt() {
+        return retryStatus == null ? BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.NOT_RETRY.getDescription() :
+                BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.valueOfDescription(retryStatus);
+    }
+
+    @ColumnDefault(value = "0")
+    @Column(name = "RETRY_NUM")
+    @ApiParam(value = "重试状态")
+    private Integer retryNum;
+
+    public int getRetryNumVal() {
+        return retryNum == null ? 0 : retryNum;
+    }
+
     /************************************** 临时属性 ***************************************/
 
     @Transient

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

@@ -320,7 +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.getSuitSid(),"suitSid",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
@@ -330,9 +330,10 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRequestSource(), "requestSource", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRetryRecordId(), "retryRecordId", ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
-
         ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());
 
         return ddlPackBean;

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

@@ -14,7 +14,11 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -529,6 +533,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("数量总和")
     private Double sumQty;
 
+    @Transient
+    @ApiParam("原数量")
+    private Double srcQty;
+
     public WmsStockSn() {
     }