Finish Task #2645 Cost:8h

【PCR-20200525-003_委外出库条码变更】中的零件号转化

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

@@ -856,7 +856,9 @@ public class WmsEnumUtil {
         INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
         CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
         MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
-        PROD_SCRAP(680, "PROD_SCRAP", "生产报废");
+        PROD_SCRAP(680, "PROD_SCRAP", "生产报废"),
+        OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料");
+
         private int value;
         private String code;
         private String description;
@@ -9023,4 +9025,50 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+
+    /**
+     * 成品条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_STATUS {
+        NORMAL(10, "正常"),
+        REPAIRE(20, "返工"),
+        SCRAP(30, "报废");
+
+        private int value;
+        private String description;
+
+        PRODUCT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PRODUCT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -1,8 +1,10 @@
 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 com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -190,6 +192,12 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "离开时间")
     private String processTime;
 
+    @Column(name = "PRODUCT_STATUS")
+    @ApiParam(value = "成品条码状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer productStatus;
+
+
     public WmsDocFgDetail(String jisNo) {
         this.jisNo = jisNo;
     }

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

@@ -244,6 +244,18 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "备注2")
     private String secondaryRemake;
 
+    @Column(name = "THIRD_REMAKE")
+    @ApiParam(value = "备注3")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue")
+    private String thirdRemake;
+
+    @Column(name = "FOURTH_REMAKE")
+    @ApiParam(value = "备注4")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue")
+    private String fourthRemake;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description : 零件装换信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-08-19 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_PART_CHANGE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "零件装换信息", description = "零件装换信息")
+public class WmsPartChange extends BaseBean {
+    private static final long serialVersionUID = -2857107665974689720L;
+
+    @Column(name = "BEF_PART_NO")
+    @ApiParam(value = "转换前物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
+    private String befPartNo;
+
+    @Column(name = "AFT_PART_NO")
+    @ApiParam(value = "转换后物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
+    private String aftPartNo;
+
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String remark;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartChange;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 零件装换信息数据访问层
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-08-19
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartChangeRepository extends BaseRepository<WmsPartChange, Long> {
+}