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

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -52,11 +52,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
-        if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
-            DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
-        } else {
-            DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
-        }
+        DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
         if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
             DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
                     purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);

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

@@ -332,4 +332,28 @@ public class WmsStockQuan extends BaseBean {
         this.scrapQty = scrapQty;
         this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
     }
+
+    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 totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty, String areaNo) {
+        this.organizeCode = organizeCode;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.unit = unit;
+        this.partNo = partNo;
+        this.partNameRdd = partName;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.totalQty = totalQty;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.scrapQty = scrapQty;
+        this.areaNo = areaNo;
+    }
 }