Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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

@@ -1229,7 +1229,9 @@ public class WmsEnumUtil {
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
         SCRAP(70, "报废"),
-        COMMING(80, "在途");
+        COMMING(80, "在途"),
+        INSPECTION(90,"待检验"),
+        HAS_INSPECTION(100,"已检验");
 
         private int value;
         private String description;
@@ -1396,8 +1398,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
         NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"),
-        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
+        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"),
-
+        REWORK(50,"REWORK","返工");
         private int value;
         private String code;
         private String description;

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.*;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
 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/WmsCSFactTrans.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -122,6 +124,11 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+    @Column(name = "package_no")
+    @ApiParam(value = "包装编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String packageNo;
+
     @Transient
     @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "实盘箱数", example = "1")

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;

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

@@ -314,6 +314,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
     private String productPlace ;
 
+    @Column(name = "STANDARD_BRACKET", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "标托", example = "1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double standardBracket;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();