Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -159,11 +159,6 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("Vin")
     private String vinCode;
 
-//    @Version
-//    @Column(name = "LOCK_VERSION")
-//    @ApiParam(value = "乐观锁", example = "1")
-//    public transient Integer lockVersion;
-
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -143,6 +143,22 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("不良处理类型")
     private String defectActionType;
 
+    @Column(name = "PROCESS_LABEL_TEMPLATE")
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
+    @Column(name = "PROD_LABEL_TEMPLATE")
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
+    @Column(name = "CUST_LABEL_TEMPLATE")
+    @ApiParam("客户标签模板")
+    private String custLabelTemplate;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 北京麦格纳BBAC库存扣减导入MODEL
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/11/22 14:46
+ * @Modify
+ */
+@Data
+@Api("北京麦格纳BBAC库存扣减导入MODEL")
+public class WmsBjmgnBbacReductModel implements Serializable {
+    @ApiParam("JIS号")
+    public String jisNo;
+    @ApiParam("物料号")
+    public String partNo;
+    @ApiParam("项目编码")
+    public String projectNo;
+    @ApiParam("客户编码")
+    public String custNo;
+}

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

@@ -17,6 +17,7 @@ import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
+import java.util.List;
 
 /**
  * @Description : PO订单明细信息
@@ -236,6 +237,10 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("汇总收货数量")
     private Double sumRcQty;
 
+    @Transient
+    @ApiParam("单据集合")
+    private List<String> orderNoLst;
+
 
     /**
      * 状态:1=新建,10=收货中,20=收货完成,

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

@@ -537,6 +537,32 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("原数量")
     private Double srcQty;
 
+    @Transient
+    @ApiParam("库位X")
+    private Integer x;
+
+    @Transient
+    @ApiParam("库位Y")
+    private Integer y;
+
+    @Transient
+    @ApiParam("库位Z")
+    private Integer z;
+
+    public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) {
+        this.sn = sn;
+        this.vendorNo = vendorNo;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.locateNo = locateNo;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
     public WmsStockSn() {
     }
 

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

@@ -28,7 +28,7 @@ public class WmsAutoPurchasePartModel extends Pager {
     private String unit;
 
     @ApiParam("物料数量")
-    private Integer qty;
+    private Double qty;
 
     @ApiParam("Erp库存地")
     private String erpWarehouse;
@@ -44,8 +44,7 @@ public class WmsAutoPurchasePartModel extends Pager {
 
     private Integer preReceivingDay;
 
-
+    public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse, Integer preReceivingDay) {
-    public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) {
         this.partNo = partNo;
         this.partName = partName;
         this.qty = qty;