Merge remote-tracking branch 'i3plus-pojo/test' into test

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

@@ -9494,6 +9494,51 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 报废类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRAP_TYPE {
+        ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"),
+        AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废");
+
+        private int value;
+        private String code;
+        private String description;
+
+        SCRAP_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
 
 

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

@@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam(value = "生产线名称")
     private String workCenterName;
 
+    @Transient
+    @ApiParam("工序名称")
+    private String processName;
+
     public MesPackage() {
     }
 

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

@@ -3692,7 +3692,8 @@ public class MesHqlPack {
         DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
         DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean);
         DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean);
         DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean);
         return packBean;

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

@@ -8,14 +8,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 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 lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -269,6 +273,17 @@ public class WmsDocMovementMaster extends BaseBean {
             isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String fourthRemake;
 
+
+    /**
+     *
+     */
+    @Column(name = "SCRAP_TYPE")
+    @ApiParam("报废类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer scrapType;
+
+
+
     @Column(name = "IS_REMOVE_ORDER")
     @ApiParam(value = "是否撤销单据")
     private Integer isRemoveOrder = CommonEnumUtil.FALSE;

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

@@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 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.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -96,6 +96,9 @@ public class WmsPartExtend extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String lotControl;
 
+    /**
+     * 单位：天
+     */
     @Column(name = "RANGE_LOT")
     @ApiParam(value = "批次容差")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)

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

@@ -6,16 +6,11 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel;
 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.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -137,6 +132,11 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("调拨单录入字段")
     private String defectiveAllocation;
 
+    //关联单号
+    @Column(name="ORDER_NO")
+    @ApiParam("关联单号")
+    private String orderNo;
+
 //    @Transient
 //    @ApiParam("打印模板列表")
 //    private String defectiveAllocation;