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/WmsEnumUtil.java

@@ -764,18 +764,18 @@ public class WmsEnumUtil {
         VDA_QC(290, "VDA_QC", "VDA质检"),
         VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
         VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
-        KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
-        KT_SCRAP(330, "KT_SCRAP", "KT报废"),
-        KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
-        KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
-        KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
-        KT_RETURN(370, "KT_RETURN", "KT退货"),
-        KT_REWORK(380, "KT_REWORK", "KT返工"),
-        KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
-        KT_SORTING(400, "KT_SORTING", "KT分选"),
+        RECEPTION(320, "RECEPTION", "让步接收"),
+        SCRAP(330, "SCRAP", "报废"),
+        QUARANTINE(340, "QUARANTINE", "隔离"),
+        BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"),
+        DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"),
+        RETURN(370, "RETURN", "KT退货"),
+        REWORK(380, "KT_REWORK", "KT返工"),
+        MISCALCULATION(390, "MISCALCULATION", "KT误判"),
+        SORTING(400, "SORTING", "KT分选"),
         VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
         VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
-        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
+        DEFINITE(430, "DEFINITE", "合格"),
         VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),

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

@@ -79,6 +79,10 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
     @ApiParam("按钮颜色")
     private String btnColor;
 
+    @Transient
+    @ApiParam("按钮类别")
+    private String btnType;
+
     public Integer getToolingType() {
         return this.toolingType == null ? 0 : this.toolingType;
     }

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class RefreshInitModuleModel<T> implements Serializable {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("用户信息")
+    private String userInfo;
+
+    @ApiParam("队列展示类型（有序/无序）")
+    private Object resultObj;
+
+    @ApiParam("展示组件定时刷新频率")
+    private Integer timer;
+
+    @ApiParam("List字段集")
+    private List<AttrBean> DataAttrList;
+
+    @ApiParam("List结果集")
+    private List<T> resultList;
+}

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

@@ -1345,7 +1345,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
-            DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean);
+            DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
@@ -1353,6 +1353,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getObjectCode(), "objectCode", packBean);
+        }
         return packBean;
     }
 

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

@@ -169,6 +169,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "srcSn")
+    @ApiParam("原条码")
+    private String srcSn;
+
     @Column(name = "SERIAl_SN")
     @ApiParam("产品条码")
     public String serialSn;

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

@@ -280,6 +280,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "包装零件号")
     private String packagePartNo;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;