|
|
@@ -629,12 +629,7 @@ public class OrderItems extends Controller {
|
|
|
SQLFactory sqlFactory1 = new SQLFactory(this, "商品发货数量汇总");
|
|
|
sqlFactory1.addParameter("siteid", siteid);
|
|
|
Rows sumQtyRows = dbConnect.runSqlQuery(sqlFactory1);
|
|
|
- RowsMap sumQtyRowsMap = sumQtyRows.toRowsMap("itemno");
|
|
|
-
|
|
|
- SQLFactory sqlFactory2 =new SQLFactory(this,"商品未发货数量汇总");
|
|
|
- sqlFactory2.addParameter("siteid", siteid);
|
|
|
- Rows sumUnQtyRows = dbConnect.runSqlQuery(sqlFactory2);
|
|
|
- RowsMap sumUnQtyRowsMap= sumUnQtyRows.toRowsMap("itemno");
|
|
|
+ RowsMap sumQtyRowsMap = sumQtyRows.toRowsMap("sa_orderitemsid");
|
|
|
|
|
|
ERPDocking erpDocking = new ERPDocking();
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
@@ -657,16 +652,11 @@ public class OrderItems extends Controller {
|
|
|
//查询附件
|
|
|
RowsMap attinfoRowsMap = getAttachmentUrl("plm_item", ids);
|
|
|
for (Row row : rows) {
|
|
|
- if (sumQtyRowsMap.get(row.getString("itemno")).isNotEmpty()) {
|
|
|
- row.put("unsoldqty", sumQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty"));
|
|
|
+ if (sumQtyRowsMap.get(row.getString("sa_orderitemsid")).isNotEmpty()) {
|
|
|
+ row.put("unsoldqty", sumQtyRowsMap.get(row.getString("sa_orderitemsid")).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);
|
|
|
}
|