【坤泰接口优化】

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

@@ -182,7 +182,7 @@ public class WmsDocMovementSn extends BaseBean {
 
     @Transient
     @ApiParam(value = "版本")
-    private String version;
+    private Integer version;
 
     public WmsDocMovementSn(){}
 
@@ -217,7 +217,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd,
-                            String whNo,String erpSrcNo,String version,Double sumQty) {
+                            String whNo,String erpSrcNo,Integer version,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -242,7 +242,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String whNo,String custNo,
+                            Integer version,String whNo,String custNo,
                             String erpSrcNo,String planDate,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
@@ -258,7 +258,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String whNo,Integer snStatus,Double sumQty) {
+                            Integer version,String whNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -271,7 +271,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
+                            Integer version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -283,4 +283,19 @@ public class WmsDocMovementSn extends BaseBean {
         this.snStatus = snStatus;
         this.sumQty = sumQty;
     }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String erpSrcNo,String vendorNo,String whNo,String assignSrcWhNo,String planDate,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.erpSrcNo = erpSrcNo;
+        this.vendorNo = vendorNo;
+        this.whNo = whNo;
+        this.srcWhNo = assignSrcWhNo;
+        this.planDate = planDate;
+        this.sumQty = sumQty;
+    }
 }

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -47,6 +49,7 @@ public class WmsMoveToERP extends BaseBean {
      * 状态:1=创建,10=待处理,20=已处理
      */
     @Column(name = "ORDER_STATUS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     @ApiParam(value = "状态", example = "0")
     public Integer orderStatus;
 

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

@@ -169,7 +169,7 @@ public class WmsPartExtend extends BaseBean {
     private Integer qcPassCount;
 
     @Column(name = "LAST_QC_TIME")
-    @ApiParam(value = "上次质检时间")
+    @ApiParam(value = "首次质检时间合格")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String lastQcTime;
 

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : AGV接口Model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-09-10 20:21
+ * @Modify:
+ **/
+@Data
+@Api("AGV接口Model")
+public class WmsAgvModel {
+
+    @ApiParam(value = "任务ID")
+    private String taskId;
+
+    @ApiParam(value = "源库位")
+    private String srcLocateNo;
+
+    @ApiParam(value = "目标库位")
+    private String destLocateNo;
+
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "需求数量")
+    private Double qty;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
+    @ApiParam(value = "物料编号集合")
+    private List<String> partNoList;
+
+    @ApiParam(value = "目标库位编号集合")
+    private List<String> destLocateNoList;
+
+}

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : PO明细回传汇总Model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-09-12 13:56
+ * @Modify:
+ **/
+@Data
+@Api("PO明细回传汇总Model")
+public class WmsPoCountModel {
+
+    @ApiParam(value = "po单号")
+    private String poOrderNo;
+
+    @ApiParam(value = "收货日期")
+    private String rcDate;
+
+    @ApiParam(value = "源单号")
+    private String srcOrderNo;
+
+    @ApiParam(value = "源行号")
+    private Integer srcItem;
+
+    @ApiParam(value = "收货批次")
+    private String lotNo;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "仓库")
+    private String whNo;
+
+    @ApiParam(value = "汇总数量")
+    private Double sumQty;
+
+    @ApiParam(value = "供应商批次")
+    private String venLotNo;
+
+    @ApiParam(value = "操作人")
+    private String user;
+
+    public WmsPoCountModel() {
+    }
+
+    public WmsPoCountModel(String poOrderNo, String rcDate, String srcOrderNo, Integer srcItem, String lotNo, String partNo, String partName, String whNo, Double sumQty, String venLotNo, String user) {
+        this.poOrderNo = poOrderNo;
+        this.rcDate = rcDate;
+        this.srcOrderNo = srcOrderNo;
+        this.srcItem = srcItem;
+        this.lotNo = lotNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.whNo = whNo;
+        this.sumQty = sumQty;
+        this.venLotNo = venLotNo;
+        this.user = user;
+    }
+}