注释来斯奥对接代码

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -451,14 +451,14 @@ public class aftersalesmag extends Controller {
                 sqlList.add("update sa_orderitems set returnqty=returnqty+" + returnqty + " where sa_orderitemsid=" + row.getString("sa_orderitemsid"));
             }
         }
-//        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
-//            ERPDocking erpDocking =new ERPDocking();
-//            String billno = rows.get(0).getString("billno");
-//            String result =erpDocking.recheckErpSareturn(billno,false,this,sa_aftersalesmagid);
-//            if(!result.equals("true")){
-//                return getErrReturnObject().setErrMsg(result).toString();
-//            }
-//        }
+        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+            ERPDocking erpDocking =new ERPDocking();
+            String billno = rows.get(0).getString("billno");
+            String result =erpDocking.recheckErpSareturn(billno,false,this,sa_aftersalesmagid);
+            if(!result.equals("true")){
+                return getErrReturnObject().setErrMsg(result).toString();
+            }
+        }
         Long sa_cashbillid = 0L;
         Long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
         if (rows.get(0).getString("type").equals("退货单")) {
@@ -575,14 +575,14 @@ public class aftersalesmag extends Controller {
                 sqlList.add("update sa_orderitems set returnqty=returnqty-" + returnqty + " where sa_orderitemsid=" + row.getString("sa_orderitemsid"));
             }
         }
-//        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
-//            ERPDocking erpDocking =new ERPDocking();
-//            String billno = rows.get(0).getString("billno");
-//            String result =erpDocking.recheckErpSareturn(billno,true,this,sa_aftersalesmagid);
-//            if(!result.equals("true")){
-//                return getErrReturnObject().setErrMsg(result).toString();
-//            }
-//        }
+        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+            ERPDocking erpDocking =new ERPDocking();
+            String billno = rows.get(0).getString("billno");
+            String result =erpDocking.recheckErpSareturn(billno,true,this,sa_aftersalesmagid);
+            if(!result.equals("true")){
+                return getErrReturnObject().setErrMsg(result).toString();
+            }
+        }
 
         Long sa_cashbillid = 0L;
         long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");

src/custom/restcontroller/webmanage/sale/dispatch/dispatch.java

@@ -800,21 +800,21 @@ public class dispatch extends Controller {
             }
         }
 
-        JSONObject object = new JSONObject();
-        object.put("classname", "getIcinvbal");
-        object.put("method", "getSainvoiceMsg");
-
-        JSONObject content = new JSONObject();
-        content.put("billno", dispatchRows.get(0).getString("billno"));
-        object.put("content", content);
-
-        WebRequest request = new WebRequest();
-        String result = request.doPost(object.toString(),
-                "http://60.190.151.198:8089/BYESB/jaxrs/webclientrest");
-        if (result.equals("true")) {
-            return getErrReturnObject().setErrMsg("K3发货单为非删除状态，无法反复核")
-                    .toString();
-        }
+//        JSONObject object = new JSONObject();
+//        object.put("classname", "getIcinvbal");
+//        object.put("method", "getSainvoiceMsg");
+//
+//        JSONObject content = new JSONObject();
+//        content.put("billno", dispatchRows.get(0).getString("billno"));
+//        object.put("content", content);
+//
+//        WebRequest request = new WebRequest();
+//        String result = request.doPost(object.toString(),
+//                "http://60.190.151.198:8089/BYESB/jaxrs/webclientrest");
+//        if (result.equals("true")) {
+//            return getErrReturnObject().setErrMsg("K3发货单为非删除状态，无法反复核")
+//                    .toString();
+//        }
 
 
         ArrayList<String> sqlList = new ArrayList<>();

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -364,28 +364,28 @@ public class Item extends Controller {
         Long itemid = content.getLong("itemid");
         Rows rows = dbConnect.runSqlQuery("select itemno from plm_item where siteid='"+siteid+"' and itemid="+itemid);
 
-        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:8089/BYESB/jaxrs/webclientrest");
-        for (Row row : rows) {
-            JSONArray jsonArrayResult = new JSONArray();
-            if(isJSONArray(result)){
-                jsonArrayResult = JSONArray.parseArray(result);
-            }
-            if(!jsonArrayResult.isEmpty()){
-                row.put("invbal_qty",((JSONObject)jsonArrayResult.get(0)).getBigDecimal("FQty"));
-            }else{
-                row.put("invbal_qty",0);
-            }
-        }
+//        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:8089/BYESB/jaxrs/webclientrest");
+//        for (Row row : rows) {
+//            JSONArray jsonArrayResult = new JSONArray();
+//            if(isJSONArray(result)){
+//                jsonArrayResult = JSONArray.parseArray(result);
+//            }
+//            if(!jsonArrayResult.isEmpty()){
+//                row.put("invbal_qty",((JSONObject)jsonArrayResult.get(0)).getBigDecimal("FQty"));
+//            }else{
+//                row.put("invbal_qty",0);
+//            }
+//        }
         return getSucReturnObject().setData(rows.isNotEmpty() ? rows.get(0) : new Row()).toString();
     }
 

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -592,28 +592,46 @@ public class OrderItems extends Controller {
 
         JSONArray jsonArray = new JSONArray();
 
-        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:8089/BYESB/jaxrs/webclientrest");
-        if (isJSONArray(result)) {
-            jsonArray = JSONArray.parseArray(result);
+//        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:8089/BYESB/jaxrs/webclientrest");
+//        if (isJSONArray(result)) {
+//            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"));
+//                }
+//            }
+//        }
+
+        ERPDocking erpDocking = new ERPDocking();
+        if (rows.toJsonArray("itemno").size() != 0) {
+            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+                jsonArray = erpDocking.getErpIcinvbalRows(1000, 1, rows.toJsonArray("itemno"));
+            }
         }
-        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"));
+        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"));
+                    }
                 }
             }
         }
+
         //查询附件
         RowsMap attinfoRowsMap = getAttachmentUrl("plm_item", ids);
         for (Row row : rows) {