Finish Task #2080 Cost:8h

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

@@ -792,7 +792,14 @@ public class WmsEnumUtil {
         CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
         AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
         FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"),
-        INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运");
+        INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"),
+        ASSEMBLY_DISASSEMBLY_STORAGE(610, "ASSEMBLY_DISASSEMBLY_STORAGE\n", "总成拆解入库"),
+        INTERNAL_WORK_ORDER_MATERIAL_STORAGE(620, "INTERNAL_WORK_ORDER_MATERIAL_STORAGE", "内部工单物料入库"),
+        PART_NUMBER_CONVERSION_MATERIAL_STORAGE(630, "PART_NUMBER_CONVERSION_MATERIAL_STORAGE", "零件号转化物料入库"),
+        PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"),
+        INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
+        CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
+        MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废");
         private int value;
         private String code;
         private String description;

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

@@ -173,4 +173,8 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "子位置号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemSeqNo;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
 }

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

@@ -223,6 +223,18 @@ public class WmsDocMovementMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
     private Integer isGoodProduct;
 
+    @Column(name = "COST_CENTER")
+    @ApiParam(value = "成本中心")
+    private String costCenter;
+
+    @Column(name = "REMAKE")
+    @ApiParam(value = "备注1")
+    private Integer remake;
+
+    @Column(name = "DESC")
+    @ApiParam(value = "备注2")
+    private String desc;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

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

@@ -256,6 +256,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer consignation = 2;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }

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

@@ -216,6 +216,19 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "方向")
     private Integer podDir;
 
+
+    @Column(name = "COST_CENTER")
+    @ApiParam(value = "成本中心")
+    private String costCenter;
+
+    @Column(name = "DESC")
+    @ApiParam(value = "备注2")
+    private String desc;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     private Long shippingId;
 

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

@@ -171,6 +171,10 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
     public String zdoc;
 
+    @ApiParam("发运单号")
+    @Column(name = "SHIPMENT_NOTE_NUMBER")
+    public String shipmentNoteNumber;
+
     public WmsPOMaster() {
 
     }