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

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

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

@@ -81,7 +81,7 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "default ''")
+    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "varchar(225) default ''")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 

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

@@ -118,6 +118,7 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("箱条码")
     private String packageNo;
+    public String createDatetime;
 
     public QueueOrderModel() {
     }
@@ -214,7 +215,8 @@ public class QueueOrderModel implements Serializable {
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
                            String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq,
-                           String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType) {
+                           String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType,
+                           String createDatetime) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -233,6 +235,7 @@ public class QueueOrderModel implements Serializable {
         this.custProdLineCode = custProdLineCode;
         this.specialFlag = specialFlag;
         this.workType = workType;
+        this.createDatetime = createDatetime;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,

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

@@ -2784,7 +2784,6 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());
-
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3592,9 +3591,6 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode());
-        if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) {
-            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean);
-        }
         if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean);
         }
@@ -3615,9 +3611,6 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule customerSnRule) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(customerSnRule, customerSnRule.getOrganizeCode());
-        if (!StringUtils.isEmpty(customerSnRule.getOrganizeCode())) {
-            DdlPreparedPack.getStringLikerPack(customerSnRule.getOrganizeCode(), "organizeCode", packBean);
-        }
         if (!StringUtils.isEmpty(customerSnRule.getCustomerCode())) {
             DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerCode(), "customerCode", packBean);
         }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -125,6 +125,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "是否允许重置")
     private Integer isResetAble;
 
+    @ApiParam(value = "是否重置")
+    private Integer isReset;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;
@@ -155,4 +158,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
         this.codeStatus = codeStatus;
     }
 
+    public int getIsResetVal() {
+        return this.isReset == null ? 0 : this.isReset;
+    }
 }