订单表体增加可销售数量

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

@@ -650,7 +650,7 @@ public class OrderItems extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems", "*");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "st_invbal_sale", "t2", "t2.siteid = t1.siteid AND t2.itemid = t1.itemid");
+        querySQL.addJoinTable(JOINTYPE.left, "st_invbal_sale", "t2", "t2.siteid = t1.siteid AND t2.itemid = t1.itemid","cansaleqty","candispatchqty");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid = t1.itemid and t3.siteid = t1.siteid",
                 "orderminqty_auxunit", "orderaddqty_auxunit", "spec", "iscustomsize", "widthschemeid", "lengthschemeid", "standards", "k3outcode");
         if (sa_promotionid > 0) {
@@ -710,19 +710,19 @@ public class OrderItems extends Controller {
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
         ArrayList<Long> itemnos = rows.toArrayList("itemno", new ArrayList<>());
 
-        SQLFactory sqlFactory1 = new SQLFactory(this, "商品发货数量汇总");
-        sqlFactory1.addParameter("siteid", siteid);
-        sqlFactory1.addParameter_in("itemnos", itemnos);
-        Rows sumQtyRows = dbConnect.runSqlQuery(sqlFactory1);
-        RowsMap sumQtyRowsMap = sumQtyRows.toRowsMap("itemno");
-
-        SQLFactory sqlFactory2 = new SQLFactory(this, "商品未发货数量汇总");
-        sqlFactory2.addParameter("siteid", siteid);
-        sqlFactory2.addParameter_in("itemnos", itemnos);
-        Rows sumUnQtyRows = dbConnect.runSqlQuery(sqlFactory2);
-        RowsMap sumUnQtyRowsMap = sumUnQtyRows.toRowsMap("itemno");
-
-
+//        SQLFactory sqlFactory1 = new SQLFactory(this, "商品发货数量汇总");
+//        sqlFactory1.addParameter("siteid", siteid);
+//        sqlFactory1.addParameter_in("itemnos", itemnos);
+//        Rows sumQtyRows = dbConnect.runSqlQuery(sqlFactory1);
+//        RowsMap sumQtyRowsMap = sumQtyRows.toRowsMap("itemno");
+//
+//        SQLFactory sqlFactory2 = new SQLFactory(this, "商品未发货数量汇总");
+//        sqlFactory2.addParameter("siteid", siteid);
+//        sqlFactory2.addParameter_in("itemnos", itemnos);
+//        Rows sumUnQtyRows = dbConnect.runSqlQuery(sqlFactory2);
+//        RowsMap sumUnQtyRowsMap = sumUnQtyRows.toRowsMap("itemno");
+//
+//
         SQLFactory sqlFactory3 = new SQLFactory(this, "商品原价汇总");
         sqlFactory3.addParameter("siteid", siteid);
         sqlFactory3.addParameter("sys_enterpriseid", sys_enterpriseid);
@@ -730,6 +730,8 @@ public class OrderItems extends Controller {
         Rows itempriceRows = dbConnect.runSqlQuery(sqlFactory3);
         RowsMap itempriceRowsMap = itempriceRows.toRowsMap("itemno");
 
+
+
         //查询附件
         RowsMap attinfoRowsMap = getAttachmentUrl("plm_item", ids);
         for (Row row : rows) {
@@ -738,19 +740,19 @@ public class OrderItems extends Controller {
             } else {
                 row.put("originalprice", BigDecimal.ZERO);
             }
-            if (sumQtyRowsMap.get(row.getString("itemno")).isNotEmpty()) {
-                row.put("unsoldqty", sumQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty"));
-            } else {
-                row.put("unsoldqty", BigDecimal.ZERO);
-            }
-            if (sumUnQtyRowsMap.get(row.getString("itemno")).isNotEmpty()) {
-                row.put("undeliqtysum", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty"));
-            } else {
-                row.put("undeliqtysum", BigDecimal.ZERO);
-            }
-            if (!row.containsKey("invbalqty")) {
-                row.put("invbalqty", BigDecimal.ZERO);
-            }
+//            if (sumQtyRowsMap.get(row.getString("itemno")).isNotEmpty()) {
+//                row.put("unsoldqty", sumQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty"));
+//            } else {
+//                row.put("unsoldqty", BigDecimal.ZERO);
+//            }
+//            if (sumUnQtyRowsMap.get(row.getString("itemno")).isNotEmpty()) {
+//                row.put("undeliqtysum", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty"));
+//            } else {
+//                row.put("undeliqtysum", BigDecimal.ZERO);
+//            }
+//            if (!row.containsKey("invbalqty")) {
+//                row.put("invbalqty", BigDecimal.ZERO);
+//            }
             row.put("attinfos", attinfoRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             row.put("contractprice", 0);
             //处理日期字段空的情况