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

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

@@ -53,10 +53,6 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("行号")
     public String item;
 
-    @Column(name = "REF_ITEM")
-    @ApiParam("关联行号")
-    public Integer refItem;
-
     @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
@@ -204,6 +200,7 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("源单行号")
     public String srcItem;
 
+
     @Column(name = "CUST_ORDER_NO")
     @ApiParam("客户订单号")
     public String custOrderNo;

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -114,4 +115,31 @@ public class WmsSuspenStockSync extends BaseBean {
     @ApiParam(value = "物料数据Map")
     private Map<String, WmsPart> partNameMap;
 
+    public String getLocateNoVal() {
+        return this.locateNo == null ? StringUtils.EMPTY : this.locateNo;
+    }
+
+    public String getPartNoAVal() {
+        return this.partNoA == null ? StringUtils.EMPTY : this.partNoA;
+    }
+
+    public String getPartNoBVal() {
+        return this.partNoB == null ? StringUtils.EMPTY : this.partNoB;
+    }
+
+    public Double getQtyAVal() {
+        return this.qtyA == null ? 0 : this.qtyA;
+    }
+
+    public Double getQtyBVal() {
+        return this.qtyB == null ? 0 : this.qtyB;
+    }
+
+    public String getLotNoAVal() {
+        return this.lotNoA == null ? StringUtils.EMPTY : this.lotNoA;
+    }
+
+    public String getLotNoBVal() {
+        return this.lotNoB == null ? StringUtils.EMPTY : this.lotNoB;
+    }
 }