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

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

@@ -12,7 +12,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description:散件零件生产配置
@@ -133,11 +132,11 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam("有效起始日期")
-    private Date effStartTime;
+    private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam("有效截至日期")
-    private Date effEndTime;
+    private String effEndTime;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 零件自动采购单信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-18
+ * @Modify:
+ **/
+@Data
+@Api("收货追踪地图信息")
+public class WmsAutoPurchasePartModel {
+    @ApiParam("合同号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("物料数量")
+    private Integer qty;
+
+    @ApiParam("Erp库存地")
+    private String erpWarehouse;
+
+    public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.qty = qty;
+        this.erpWarehouse = warehouse;
+    }
+
+    public WmsAutoPurchasePartModel() {
+
+    }
+}