查询商品组逻辑优化及发货单商品查询添加订单号

src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -131,7 +131,15 @@ public class itemgroup extends Controller {
 
                 ArrayList<Long> list = ItemClass.getSubItemClassIds(this, whereObject.getLong("itemclassid"));
                 list.add(whereObject.getLong("itemclassid"));
-                factorygroupid.addParameter_in("itemclassid", list);
+                ArrayList<Long> listNew = new ArrayList<>();
+                listNew.add((long) 0);
+                for (long itemclassid:list) {
+                    if(itemclassList.contains(itemclassid)){
+                        listNew.add(itemclassid);
+                    }
+                }
+
+                factorygroupid.addParameter_in("itemclassid", listNew);
 
             } else {
                 factorygroupid.addParameter_in("itemclassid",

src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货商品列表查询.sql

@@ -8,7 +8,8 @@ SELECT t1.sa_orderitemsid,
        t1.unit,
        t1.undeliqty,
        t1.remarks,
-       t1.rowno
+       t1.rowno,
+       t3.sonum
 FROM sa_orderitems t1
          inner join plm_item t2 on t1.siteid = t2.siteid and t1.itemid = t2.itemid
          inner join sa_order t3 on t1.siteid=t3.siteid and t1.sa_orderid=t3.sa_orderid