Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -4,17 +4,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -30,7 +25,9 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_PACKAGE")
+@Table(name = "IF_PACKAGE", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "MODIFY_DATE_TIME")})
 @Api("包装条码接口表")
 public class IfPackage extends BaseBean implements Serializable {
 

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
      */

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

@@ -428,7 +428,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("报废类型名字")
     public String scrapTypeName;
 
-
+    @Transient
+    @ApiParam(value = "主表id")
+    private Long masterId;
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;