|
|
@@ -202,11 +202,11 @@ public class sendplandetail extends Controller {
|
|
|
" inner join sa_orderitems t2 on t1.sa_orderid=t2.sa_orderid " +
|
|
|
" where t1.status='审核' and t2.isclose=0 and t2.undeliqty>0 and t1.siteid='" + siteid + "' " +
|
|
|
" group by t2.itemid ");
|
|
|
- Rows invbalrows = dbConnect.runSqlQuery("select itemid,sum(qty) qty from st_invbal t1 group by itemid");
|
|
|
+ Rows invbalSalerows = dbConnect.runSqlQuery("select itemid,qty from st_invbal_sale");
|
|
|
Rows sendplandetails = dbConnect.runSqlQuery("select t1.sa_sendplandetailid,t1.sa_orderid,t2.itemid,t1.sendqty from sa_sendplandetail t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.sa_sendplanid=" + sa_sendplanid + " and t1.siteid='" + siteid + "' order by t2.sa_orderid desc");
|
|
|
|
|
|
RowsMap stockbillrowsMap = stockbillrows.toRowsMap("itemid");
|
|
|
- RowsMap invbalrowsMap = invbalrows.toRowsMap("itemid");
|
|
|
+ RowsMap invbalSalerowsMap = invbalSalerows.toRowsMap("itemid");
|
|
|
for (Row row : sendplandetails) {
|
|
|
BigDecimal canuseqty = BigDecimal.ZERO;
|
|
|
BigDecimal willoutqty = BigDecimal.ZERO;
|
|
|
@@ -216,8 +216,8 @@ public class sendplandetail extends Controller {
|
|
|
if (stockbillrowsMap.containsKey(row.getString("itemid"))) {
|
|
|
willoutqty = stockbillrowsMap.get(row.getString("itemid")).get(0).getBigDecimal("qty");
|
|
|
}
|
|
|
- if (invbalrowsMap.containsKey(row.getString("itemid"))) {
|
|
|
- invbalqty = invbalrowsMap.get(row.getString("itemid")).get(0).getBigDecimal("qty");
|
|
|
+ if (invbalSalerowsMap.containsKey(row.getString("itemid"))) {
|
|
|
+ invbalqty = invbalSalerowsMap.get(row.getString("itemid")).get(0).getBigDecimal("qty");
|
|
|
}
|
|
|
canuseqty = invbalqty.subtract(willoutqty);
|
|
|
updateSQL.setValue("willoutqty", willoutqty);
|
