|
|
@@ -247,12 +247,13 @@ public class tpartreimbursement extends Controller {
|
|
|
}
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
if (issubmit) {
|
|
|
- Rows rowsdetail = dbConnect.runSqlQuery("select t1.sa_orderitemsid from sa_tpartreimbursementdetail t1 where t1.sa_tpartreimbursementid ='"
|
|
|
+ Rows rowsdetail = dbConnect.runSqlQuery("select t1.sa_orderitemsid,t1.checkqty,t1.sa_tpartreimbursementdetailid from sa_tpartreimbursementdetail t1 where t1.sa_tpartreimbursementid ='"
|
|
|
+ sa_tpartreimbursementid + "' and t1.siteid='" + siteid + "'");
|
|
|
|
|
|
QuerySQL tpartreimbursementdetailQuery = SQLFactory.createQuerySQL(dbConnect, "sa_tpartreimbursementdetail", "sa_orderitemsid");
|
|
|
tpartreimbursementdetailQuery.addQueryFields("sumqty", "sum(checkqty)");
|
|
|
tpartreimbursementdetailQuery.setWhere("sa_orderitemsid", rowsdetail.toArrayList("sa_orderitemsid"));
|
|
|
+ tpartreimbursementdetailQuery.setWhere("sa_tpartreimbursementid !="+sa_tpartreimbursementid);
|
|
|
tpartreimbursementdetailQuery.addGroupBy("sa_orderitemsid");
|
|
|
|
|
|
|
|
|
@@ -273,7 +274,7 @@ public class tpartreimbursement extends Controller {
|
|
|
|
|
|
for (int i = 0; i < rowsdetail.size(); i++) {
|
|
|
if(rowsMap.containsKey(rowsdetail.get(i).getString("sa_orderitemsid"))){
|
|
|
- if(rowsMap.get(rowsdetail.get(i).getString("sa_orderitemsid")).get(0).getBigDecimal("qty").compareTo(rowsdetail.get(i).getBigDecimal("qty"))<0){
|
|
|
+ if(rowsMap.get(rowsdetail.get(i).getString("sa_orderitemsid")).get(0).getBigDecimal("qty").compareTo(rowsdetail.get(i).getBigDecimal("checkqty"))<0){
|
|
|
return getErrReturnObject().setErrMsg("该配件核销单数量不符合要求,请检查").toString();
|
|
|
}
|
|
|
}else{
|
|
|
@@ -322,6 +323,7 @@ public class tpartreimbursement extends Controller {
|
|
|
QuerySQL tpartreimbursementdetailQuery = SQLFactory.createQuerySQL(dbConnect, "sa_tpartreimbursementdetail", "sa_orderitemsid");
|
|
|
tpartreimbursementdetailQuery.addQueryFields("sumqty", "sum(checkqty)");
|
|
|
tpartreimbursementdetailQuery.setWhere("sa_orderitemsid", rowsdetail.toArrayList("sa_orderitemsid"));
|
|
|
+ tpartreimbursementdetailQuery.setWhere("sa_tpartreimbursementid !="+sa_tpartreimbursementid);
|
|
|
tpartreimbursementdetailQuery.addGroupBy("sa_orderitemsid");
|
|
|
|
|
|
|