返退单订单非必选

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/商品列表查询.sql

@@ -0,0 +1,10 @@
+SELECT
+	0 sa_orderitemsid,
+	0 sa_orderid,
+	t1.*
+FROM
+	plm_item t1
+WHERE
+  t1.siteid = $siteid$
+	AND $where$
+	AND t1.itemid not in (select itemid from sa_aftersalesmag_items where sa_aftersalesmagid=$sa_aftersalesmagid$ and siteid = $siteid$ )

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

@@ -67,7 +67,7 @@ public class aftersalesmag extends Controller {
             Rows soaderRows = dbConnect.runSqlQuery(
                     "select sa_orderid,sa_accountclassid,rebate_userate from sa_order where sa_orderid=" + sa_orderid);
             if (soaderRows.isEmpty()) {
-                return getErrReturnObject().setErrMsg("该订单不存在").toString();
+                //return getErrReturnObject().setErrMsg("该订单不存在").toString();
             } else {
                 sqlFactory.addParameter("sa_accountclassid", soaderRows.get(0).getLong("sa_accountclassid"));
                 sqlFactory.addParameter("rebate_userate", soaderRows.get(0).getBigDecimal("rebate_userate"));

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

@@ -41,7 +41,13 @@ public class aftersalesmagItems extends Controller {
                 where.append(")");
             }
         }
-        SQLFactory sqlFactory = new SQLFactory(this, "返退商品列表查询", pageSize, pageNumber, pageSorting);
+        SQLFactory sqlFactory;
+        if(sa_orderid>0){
+            sqlFactory = new SQLFactory(this, "返退商品列表查询", pageSize, pageNumber, pageSorting);
+        }else {
+            sqlFactory = new SQLFactory(this, "商品列表查询", pageSize, pageNumber, pageSorting);
+        }
+
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("sa_orderid", sa_orderid);
         sqlFactory.addParameter("sa_aftersalesmagid", sa_aftersalesmagid);

src/custom/utility/ERPDocking.java

@@ -3,6 +3,8 @@ package utility;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.YosException;
+import common.data.Row;
+import common.data.Rows;
 import utility.tools.WebRequest;
 
 import java.io.BufferedReader;
@@ -80,7 +82,7 @@ public class ERPDocking {
     }
 
     /**
-     *
+     *查询Erp库存
      * @param pagerows
      * @param pagenum
      * @param fitemnos
@@ -111,6 +113,84 @@ public class ERPDocking {
             return resultobject.getJSONObject("results").getJSONArray("list");
         }
     }
+
+    /**
+     * 创建Erp发货单
+     * @param dispatchRow
+     * @param dispatchItems
+     * @return
+     * @throws YosException
+     */
+    public String createErpSainvoice(Row dispatchRow, Rows dispatchItems) throws YosException {
+        {
+
+            JSONObject object= new JSONObject();
+            JSONObject objectdetail= new JSONObject();
+            JSONArray jsonArray =new JSONArray();
+            object.put("access_token","basicDrp");
+            object.put("classname","Sainvoice");
+            object.put("method","createSainvoice");
+            objectdetail.put("finvonum",dispatchRow.getString("billno"));
+            objectdetail.put("fagentnum",dispatchRow.getString("agentnum"));
+            objectdetail.put("fagentname",dispatchRow.getString("enterprisename"));
+            objectdetail.put("fsonum",dispatchRow.getString("sonum"));
+            objectdetail.put("fdate",dispatchRow.getString("billdate"));
+            objectdetail.put("fnotes",dispatchRow.getString("remarks"));
+            objectdetail.put("fcontact",dispatchRow.getString("name"));
+            objectdetail.put("fmobilephone",dispatchRow.getString("phonenumber"));
+            objectdetail.put("faddress",dispatchRow.getString("address"));
+            if(dispatchItems.isNotEmpty()){
+                for (Row row:dispatchItems) {
+                    JSONObject jsonObject=new JSONObject();
+                    jsonObject.put("fsonum", row.getString("sonum"));
+                    jsonObject.put("fsorownum", row.getString("sorowno"));
+                    jsonObject.put("fprodnum", row.getString("itemno"));
+                    jsonObject.put("fbatchbnum", row.getString("batchno"));
+                    jsonObject.put("frownum", row.getString("rowno"));
+                    jsonObject.put("fqty", row.getString("qty"));
+                    jsonObject.put("fprice", row.getString("price"));
+                    jsonObject.put("fremarks", row.getString("remarks"));
+                    jsonArray.add(jsonObject);
+                }
+            }
+            objectdetail.put("details",jsonArray);
+            object.put("content",objectdetail);
+
+            HashMap<String, String> map = new HashMap<>();
+            map.put("content-Type", "application/json");
+            String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
+            JSONObject resultobject = JSONObject.parseObject(result);
+            return resultobject.getJSONObject("results").getString("data");
+        }
+    }
+
+
+    /**
+     * 关闭Erp发货单
+     * @param billno
+     * @param isManual
+     * @return
+     * @throws YosException
+     */
+    public String closeErpSainvoice(String billno, boolean isManual) throws YosException {
+        {
+
+            JSONObject object= new JSONObject();
+            JSONObject objectdetail= new JSONObject();
+            object.put("access_token","basicDrp");
+            object.put("classname","Sainvoice");
+            object.put("method","closeSainvoice");
+            objectdetail.put("finvonum",billno);
+            objectdetail.put("isManual",isManual);
+            object.put("content",objectdetail);
+
+            HashMap<String, String> map = new HashMap<>();
+            map.put("content-Type", "application/json");
+            String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
+            JSONObject resultobject = JSONObject.parseObject(result);
+            return resultobject.getJSONObject("results").getString("data");
+        }
+    }
 //    /**
 //     * crm账号同步反馈
 //     *