Jenkins自动合并

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange;
 import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -19,6 +20,9 @@ public class WmsCSOrderMasterModel implements Serializable {
     @ApiParam("盘点订单主表")
     public List<WmsCSOrderMaster> wmsCSOrderMasterList;
 
+    @ApiParam("盘点调差表")
+    public List<WmsCSAdjustRange>  wmsCSAdjustRangeList;
+
     @ApiParam("工厂代码")
     public String  organizeCode;
 

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

@@ -110,4 +110,29 @@ public class QadBop  implements Serializable {
     @Column(name="CREATE_DATE_TIME")
     @ApiParam("创建时间")
     public String createDateTime;
+
+    @Transient
+    @ApiParam("收货时是供应商编号，发运时是客户发往地")
+    public String inAddr;
+
+    @Transient
+    @ApiParam("工厂代码")
+    public String inSite;
+
+    public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) {
+        this.bopCode = bopCode;
+        this.bopDesc = bopDesc;
+        this.bopDomain = bopDomain;
+        this.parentPart = parentPart;
+        this.parentReturnPart = parentReturnPart;
+        this.bopdwQty = bopdwQty;
+        this.subBopCode = subBopCode;
+        this.subBopPart = subBopPart;
+        this.subItemPart = subItemPart;
+        this.subQty = subQty;
+        this.subUnit = subUnit;
+        this.createDateTime = createDateTime;
+        this.inAddr = inAddr;
+        this.inSite = inSite;
+    }
 }

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

@@ -122,4 +122,8 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("客户零件号")
     private String customerPartNo;
+
+    @Transient
+    @ApiParam("父层级packcode对应的可回用零件号")
+    private String parentReturnPart;
 }

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

@@ -146,6 +146,10 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "特殊批次")
     private String fixLotNo = "";
 
+    @Transient
+    @ApiParam("父层级packcode对应的可回用零件号")
+    private String parentReturnPart;
+
     public WmsPoSn(){}
 
     public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){