bug:8268;8267;8266;8265

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

@@ -715,8 +715,8 @@ public class WmsEnumUtil {
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
         TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
-        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
-
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
         private int value;
         private String code;
         private String description;
@@ -3567,7 +3567,10 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_STOCK_TYPE {
-        SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码");
+        SOURCE(10, "实物条码"),
+        TARGET(20, "虚拟条码"),
+        CUST_SN(30, "客户条码"),
+        FIRST_MIDDLE_LAST(40, "首中末件");
 
         private int value;
         private String description;

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

@@ -47,4 +47,14 @@ public class WmsCustWindow extends BaseBean {
     @Column(name = "DELAY_HOUR")
     @ApiParam(value = "容差")
     private Integer delayHour;
+
+    public WmsCustWindow(WmsCustWindow custWindow) {
+        this.custNo = custWindow.getCustNo();
+        this.custWindowTime = custWindow.getCustWindowTime();
+        this.weeks = custWindow.getWeeks();
+        this.delayHour = custWindow.getDelayHour();
+    }
+
+    public WmsCustWindow() {
+    }
 }

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

@@ -1,7 +1,6 @@
 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.WmsEnumUtil;
 import io.swagger.annotations.Api;
@@ -359,4 +358,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
+
+    public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) {
+        this.orderNo = poMasterDetails.getOrderNo();
+        this.planDate = poMasterDetails.getPlanDate();
+        this.planTime = poMasterDetails.getPlanTime();
+    }
 }

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

@@ -217,4 +217,12 @@ public class WmsDocMovementMaster extends BaseBean {
     public int getBusiTypeVal() {
         return this.busiType == null ? 0 : this.busiType;
     }
+
+    public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) {
+        this.orderNo = wmsPoMaster.getOrderNo();
+        this.vendorNo = wmsPoMaster.getVendorNo();
+    }
+
+    public WmsDocMovementMaster() {
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java

@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @Description : 发运计划任务跟踪
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-27 4:37 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+public class AssignmentDto {
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @ApiParam(value = "主键", example = "0")
+    public Long id;
+
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @ApiParam(value = "时间")
+    private String createDatetime;
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件号名称")
+    private String partNameRdd;
+
+    @ApiParam(value = "源存储区")
+    private String srcZoneNo;
+
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
+    @ApiParam(value = "状态中文描述", example = "1")
+    private String itemStatusStr;
+
+    @ApiParam(value = "出库数量")
+    private Double outQty;
+
+    public AssignmentDto(String orderNo, String createDatetime, String partNameRdd,
+                         String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) {
+        this.orderNo = orderNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.srcZoneNo = srcZoneNo;
+        this.custNo = custNo;
+        this.itemStatus = itemStatus;
+        this.outQty = outQty;
+        this.partNo = partNo;
+    }
+
+    public AssignmentDto() {
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java

@@ -72,4 +72,7 @@ public class WmsStockSnDto {
         this.partSpec = partSpec;
         this.zoneNo = zoneNo;
     }
+
+    public WmsStockSnDto() {
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java

@@ -21,6 +21,9 @@ public class WmsSupplierExtensionDto {
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
+    @ApiParam(value = "供应商编号")
+    private String vendorName;
+
     @ApiParam(value = "数量")
     private Integer num;
 
@@ -28,8 +31,9 @@ public class WmsSupplierExtensionDto {
 
     }
 
-    public WmsSupplierExtensionDto(String vendorNo, Integer num) {
+    public WmsSupplierExtensionDto(String vendorNo, Integer num, String vendorName) {
         this.vendorNo = vendorNo;
         this.num = num;
+        this.vendorName = vendorName;
     }
 }