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

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

@@ -1,8 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Reference:
@@ -48,6 +51,9 @@ public class MesProdBindRecordModel {
     private String serialNumber;
     @ApiParam("关联批次")
     private String lotNo;
+    @ApiParam("数据集合")
+    private List<MesProdBindRecord> mesProdBindRecords;
+
     public MesProdBindRecordModel() {
 
     }
@@ -122,4 +128,5 @@ public class MesProdBindRecordModel {
         this.serialNumber = serialNumber;
         this.lotNo = lotNo;
     }
+
 }

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

@@ -2835,7 +2835,7 @@ public class MesHqlPack {
      * @return
      */
     public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesUserSkill, organizeCode);
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode, CommonEnumUtil.VALID);
         if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3772,6 +3772,7 @@ public class MesHqlPack {
 
     /**
      * 数据迁移表查询条件封装
+     *
      * @param cfg
      * @return
      */