|
|
@@ -81,7 +81,7 @@ public class sendplandetail extends Controller {
|
|
|
" 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 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 + "'");
|
|
|
+ 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");
|
|
|
@@ -162,7 +162,7 @@ public class sendplandetail extends Controller {
|
|
|
|
|
|
|
|
|
ArrayList<String> list = new ArrayList<>();
|
|
|
- Rows sendplandetailsgroupitemid = dbConnect.runSqlQuery("select t2.itemid,t1.sa_sendplandetailid,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=" + sendplandetails.get(0).getLong("sa_sendplanid") + " and t2.itemid="+sendplandetails.get(0).getLong("itemid")+" and t1.siteid='" + siteid + "'");
|
|
|
+ Rows sendplandetailsgroupitemid = dbConnect.runSqlQuery("select t2.itemid,t1.sa_sendplandetailid,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=" + sendplandetails.get(0).getLong("sa_sendplanid") + " and t2.itemid="+sendplandetails.get(0).getLong("itemid")+" and t1.siteid='" + siteid + "' order by t2.sa_orderid desc");
|
|
|
BigDecimal sendqtyold = BigDecimal.ZERO;
|
|
|
for(int a=0; a<sendplandetailsgroupitemid.size();a++){
|
|
|
if(a>0){
|
|
|
@@ -170,6 +170,7 @@ public class sendplandetail extends Controller {
|
|
|
}
|
|
|
sendqtyold=sendqtyold.add(sendplandetailsgroupitemid.get(a).getBigDecimal("sendqty"));
|
|
|
}
|
|
|
+ dbConnect.runSqlUpdate(list);
|
|
|
return getSucReturnObject().toString();
|
|
|
}
|
|
|
|