选择送货明细列表添加订单号经销商

src/custom/restcontroller/webmanage/sale/logistics/LSALogistics.java

@@ -187,6 +187,7 @@ public class LSALogistics extends Controller {
     @API(title = "选择送货明细列表", apiversion = R.ID20230720141802.v1.class)
     public String selectChooseMXList() throws YosException {
         StringBuffer where = new StringBuffer(" 1=1 ");
+         System.out.println("666666666666666666");
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
@@ -202,7 +203,7 @@ public class LSALogistics extends Controller {
         Long sa_logisticsid = content.getLongValue("sa_logisticsid");
         Long sys_enterpriseid = content.getLongValue("sys_enterpriseid");
 
-        pageSorting = pageSorting.equals("''") ? "rowno" : pageSorting;
+        pageSorting = pageSorting.equals("''") ? "t1.rowno" : pageSorting;
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "st_stockbill_items",
                 "st_stockbill_itemsid","unit","amount","remarks");
@@ -211,15 +212,21 @@ public class LSALogistics extends Controller {
                 "billno");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid =t1.itemid and t3.siteid=t1.siteid",
                 "spec","itemno", "itemname", "model");
-        querySQL.addQueryFields("price","amount/qty");
-        querySQL.addQueryFields("qty","qty-ifnull(transportqty,0)");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_dispatch_items", "t4", "t4.sa_dispatch_itemsid = t1.sa_dispatch_itemsid AND t4.siteid = t1.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_orderitems", "t5", "t5.sa_orderitemsid=t4.sa_orderitemsid and t5.siteid=t4.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t6", "t6.sa_orderid=t5.sa_orderid and t6.siteid=t5.siteid","sonum");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t7", "t7.sys_enterpriseid=t2.sys_enterpriseid and t7.siteid=t2.siteid","agentnum");
+
+        querySQL.addQueryFields("price","t1.amount/t1.qty");
+        querySQL.addQueryFields("qty","t1.qty-ifnull(t1.transportqty,0)");
         querySQL.setWhere("t1.siteid='" + siteid + "'");
         querySQL.setWhere("t2.sys_enterpriseid=" + sys_enterpriseid);
         querySQL.setWhere("t2.status='审核'");
-        querySQL.setWhere("ifnull(t1.transportqty,0)<qty");
+        querySQL.setWhere("ifnull(t1.transportqty,0)<t1.qty");
         querySQL.setWhere("NOT EXISTS(SELECT 1 from sa_logistics_items WHERE sa_logisticsid=" + sa_logisticsid + " and st_stockbill_itemsid=t1.st_stockbill_itemsid)");
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
+         System.out.println(querySQL.getSQL());
         Rows rows = querySQL.query();