发货单所有明细bug修复

src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货单明细关联商品列表查询.sql

@@ -1,4 +1,5 @@
 SELECT
+       t1.itemid,
        t1.itemno,
        t1.itemname,
        t2.unitname

src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货单明细关联订单列表查询.sql

@@ -5,7 +5,8 @@ SELECT
        t1.rowno  orderRowno,
        t1.price,
        t1.undeliqty,
-       t1.deliedqty
+       t1.deliedqty,
+       t1.sa_orderitemsid
 FROM
 	sa_orderitems t1
 	INNER JOIN sa_order t2 ON t1.sa_orderid = t2.sa_orderid AND t1.siteid = t2.siteid 

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

@@ -345,7 +345,7 @@ public class dispatchItems extends Controller {
         SQLFactory ordersqlFactory = new SQLFactory(this, "发货单明细关联订单列表查询");
         ordersqlFactory.addParameter("siteid", siteid);
         ordersqlFactory.addParameter_in("sa_orderitemsids", rows.toArrayList("sa_orderitemsid",new ArrayList<>()));
-        Rows orderRows = dbConnect.runSqlQuery(itemsqlFactory);
+        Rows orderRows = dbConnect.runSqlQuery(ordersqlFactory);
         RowsMap orderRowsMap =orderRows.toRowsMap("sa_orderitemsid");
 
         for (Row row :rows) {
@@ -434,7 +434,7 @@ public class dispatchItems extends Controller {
     //查询订单列表(管理端)
     public QuerySQL queryListManage(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_dispatch_items",
-                "sa_dispatch_itemsid","sa_dispatchid","sa_orderitemsid","isclose","rowno","itemid","outwarehousedate","batchno","remarks","ifnull(t1.qty, 0)"," ifnull(t1.outwarehouseqty, 0)");
+                "sa_dispatch_itemsid","sa_dispatchid","sa_orderitemsid","isclose","rowno","itemid","outwarehousedate","batchno","remarks");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_dispatch", "t4", "t4.sa_dispatchid = t1.sa_dispatchid AND t4.siteid = t1.siteid",
                 "billno","status","billdate","closedate");
@@ -442,6 +442,8 @@ public class dispatchItems extends Controller {
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t10", "t10.sys_enterpriseid = t4.sys_enterpriseid and t10.siteid = t4.siteid",
                 "enterprisename");
+        querySQL.addQueryFields("qty","ifnull(t1.qty, 0)");
+        querySQL.addQueryFields("outwarehouseqty","ifnull(t1.outwarehouseqty, 0)");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         querySQL.setWhere("t4.status in ('审核','复核','关闭','手工关闭')");