|
@@ -234,7 +234,7 @@ public class dispatchItems extends Controller {
|
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
|
Rows rows = dbConnect.runSqlQuery(sqlFactory);
|
|
|
RowsMap rowsMap = rows.toRowsMap("itemno");
|
|
|
-// ERPDocking erpDocking = new ERPDocking();
|
|
|
+ ERPDocking erpDocking = new ERPDocking();
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
JSONObject object = new JSONObject();
|
|
|
object.put("classname", "getIcinvbal");
|
|
@@ -246,17 +246,17 @@ public class dispatchItems extends Controller {
|
|
|
|
|
|
WebRequest request = new WebRequest();
|
|
|
//System.out.println(object.toString());
|
|
|
- String result = request.doPost(object.toString(),
|
|
|
- "http://60.190.151.198:8089/BYESB/jaxrs/webclientrest");
|
|
|
- if(isJSONArray(result)){
|
|
|
- jsonArray = JSONArray.parseArray(result);
|
|
|
- }
|
|
|
-// 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"));
|
|
|
-// }
|
|
|
-//
|
|
|
+// String result = request.doPost(object.toString(),
|
|
|
+// "http://60.190.151.198:8089/BYESB/jaxrs/webclientrest");
|
|
|
+// if(isJSONArray(result)){
|
|
|
+// jsonArray = JSONArray.parseArray(result);
|
|
|
// }
|
|
|
+ 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"));
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
SQLFactory sqlFactory1 = new SQLFactory(this, "商品发货数量汇总");
|
|
|
sqlFactory1.addParameter("siteid", siteid);
|
|
|
sqlFactory1.addParameter_in("itemno", rows.toArrayList("itemno",new ArrayList<>()));
|