修复TJ MGN BUG

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

@@ -88,6 +88,11 @@ public class WmsCSRange extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     public String areaNo;
 
+    @Transient
+    @ApiParam("存储区")
+    @AnnoOutputColumn(hidden = true)
+    public String basZoneNo;
+
     public WmsCSRange(){}
 
     public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
@@ -96,8 +101,9 @@ public class WmsCSRange extends BaseBean {
         this.partNameRdd = partNameRdd;
     }
 
-    public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) {
+    public WmsCSRange(String zoneNo, String basZoneNo, String areaNo, String partNo, String partNameRdd) {
         this.zoneNo = zoneNo;
+        this.basZoneNo = basZoneNo;
         this.areaNo = areaNo;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -247,7 +247,7 @@ public class WmsStockQuan extends BaseBean {
 
     public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName,
                         Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
-                        Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+                        Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
         this.organizeCode = organizeCode;
         this.whNo = whNo;
         this.zoneNo = zoneNo;
@@ -262,7 +262,7 @@ public class WmsStockQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
-        this.sumQty = sumQty;
+        this.totalQty = totalQty;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1203,7 +1203,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean);
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean);
-        if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
+        if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) {
             List<String> columnNames = new ArrayList<>();
             columnNames.add("srcZoneNo");
             columnNames.add("destZoneNo");