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

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

@@ -8,8 +8,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
+
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -114,43 +116,43 @@ public class WmsMoveDetails extends BaseBean {
     @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
-            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
+            searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
     public String srcWhNo;
 
     @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
+            searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     public String srcZoneNo;
 
     @Column(name = "SRC_LOCATE_NO")
     @ApiParam("源库位代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
-            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     public String srcLocateNo;
 
     @Column(name = "DEST_WH_NO")
     @ApiParam("目标仓库代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
-            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
+            searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
     public String destWhNo;
 
     @Column(name = "DEST_ZONE_NO")
     @ApiParam("目标存储区代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
+            searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     public String destZoneNo;
 
     @Column(name = "DEST_LOCATE_NO")
     @ApiParam("目标库位代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
-            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     public String destLocateNo;
 
     /**
@@ -195,11 +197,22 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomVersion;
 
-    @ApiParam(value = "待出库数量", example = "0")
+
+    @ApiParam(value = "源库位余额")
+    @ColumnDefault("0")
+    @Column(name = "SRC_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)")
+    private Double srcLocateRestQty = 0D;
+
+    @ApiParam(value = "目标库位余额")
+    @ColumnDefault("0")
+    @Column(name = "DEST_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)")
+    private Double destLocateRestQty = 0D;
+
+    @ApiParam(value = "待出库数量")
     @Transient
     private Long waitingCounts;
 
-    @ApiParam(value = "已出库数量", example = "0")
+    @ApiParam(value = "已出库数量")
     @Transient
     private Long finishedCounts;
 
@@ -371,6 +384,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }
+
     public Double getHandledQtyVal() {
         return this.handledQty == null ? 0 : this.handledQty.doubleValue();
     }

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

@@ -4,8 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
+
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -179,7 +181,7 @@ public class WmsStockQuan extends BaseBean {
 
     @Transient
     @ApiParam(value = "差异数量MAP")
-    private Map<String, Map<String,Double>> differenceQtyMap;
+    private Map<String, Map<String, Double>> differenceQtyMap;
 
 
     public Integer getIsSnapshot() {
@@ -190,6 +192,11 @@ public class WmsStockQuan extends BaseBean {
         return areaNo;
     }
 
+    public Double getTotalQty() {
+        return this.getQtyVal() + this.getFailQtyVal()+ this.getHoldQtyVal()+ this.getQcQtyVal()
+                + this.getRinQtyVal()+ this.getFreezeQtyVal()+ this.getConsignQtyVal()+ this.getScrapQtyVal();
+    }
+
     public Double getQtyVal() {
         return this.qty == null ? 0 : this.qty;
     }
@@ -295,6 +302,7 @@ public class WmsStockQuan extends BaseBean {
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
     }
+
     public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;
         this.failQty = failQty;
@@ -378,6 +386,7 @@ public class WmsStockQuan extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.qty = qty;
     }
+
     public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;