Sfoglia il codice sorgente

经销商订单库存显示有货或者缺货,总部显示实际库存数量

hu 2 anni fa
parent
commit
97acbfb016

+ 19 - 13
src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -29,6 +29,7 @@ import restcontroller.webmanage.sale.rebate.Rebate;
 import restcontroller.webmanage.sale.toolbill.ToolBilItem;
 import restcontroller.webmanage.sale.toolbill.ToolBill;
 import utility.ERPDocking;
+import utility.tools.WebRequest;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -684,21 +685,26 @@ public class OrderItems extends Controller {
         Rows sumUnQtyRows = dbConnect.runSqlQuery(sqlFactory2);
         RowsMap sumUnQtyRowsMap = sumUnQtyRows.toRowsMap("itemno");
 
-        ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray = new JSONArray();
-        if (rows.toJsonArray("itemno").size() != 0) {
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
-                jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rows.toJsonArray("itemno"));
-            }
-        }
 
-        if (!jsonArray.isEmpty()) {
-            for (Object object : jsonArray) {
-                JSONObject jsonObject = (JSONObject) object;
-                if (rowsMap.containsKey(jsonObject.getString("fitemno"))) {
-                    if (rowsMap.get(jsonObject.getString("fitemno")).isNotEmpty()) {
-                        rowsMap.get(jsonObject.getString("fitemno")).get(0).put("invbalqty", jsonObject.getBigDecimalValue("fqty"));
-                    }
+        JSONObject object = new JSONObject();
+        object.put("classname", "getIcinvbal");
+        object.put("method", "getMsg");
+
+        JSONObject content = new JSONObject();
+        content.put("fitemnos",  rows.toJsonArray("itemno"));
+        object.put("content", content);
+
+        WebRequest request = new WebRequest();
+        String result = request.doPost(object.toString(),
+                "http://60.190.151.198:8092/BYESB/jaxrs/webclientrest");
+        jsonArray = JSONArray.parseArray(result);
+
+        for (Object obj : jsonArray) {
+            JSONObject jsonObject = (JSONObject) obj;
+            if (rowsMap.containsKey(jsonObject.getString("fitemno"))) {
+                if (rowsMap.get(jsonObject.getString("fitemno")).isNotEmpty()) {
+                    rowsMap.get(jsonObject.getString("fitemno")).get(0).put("invbalqty", jsonObject.getBigDecimalValue("FQty"));
                 }
             }
         }