10121 配件核销单管理，处理作假虚报问题相关优化

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursement.java

@@ -336,7 +336,7 @@ public class tpartreimbursement extends Controller {
         orderitemsQuery.setTableAlias("t1");
         orderitemsQuery.addJoinTable(JOINTYPE.left, tpartreimbursementdetailQuery, "t2", "t1.sa_orderitemsid=t2.sa_orderitemsid");
         orderitemsQuery.setWhere("t1.sa_orderitemsid", rowsdetail.toArrayList("sa_orderitemsid"));
-        orderitemsQuery.addQueryFields("qty", "t1.tobeoffqty-ifnull(t2.sumqty,0)");
+        orderitemsQuery.addQueryFields("qty", "t1.canoffqty-ifnull(t2.sumqty,0)");
         Rows orderitemsrows = orderitemsQuery.query();
         RowsMap rowsMap = orderitemsrows.toRowsMap("sa_orderitemsid");
         if (!rows.get(0).getBoolean("createflag")) {
@@ -352,16 +352,12 @@ public class tpartreimbursement extends Controller {
             if (rowsMap.containsKey(sa_orderitemsid)) {
                 //审核数量
                 BigDecimal checkqty = rowsdetail.get(i).getBigDecimal("checkqty");
-                //订单明细中的数量
+                //剩余可核销数量
                 BigDecimal qty = rowsMap.get(sa_orderitemsid).get(0).getBigDecimal("qty");
-                //订单明细中的可核销数量
-                BigDecimal canoffqty = rowsMap.get(sa_orderitemsid).get(0).getBigDecimal("canoffqty");
-                if (qty.compareTo(checkqty) < 0 && checkqty.compareTo(BigDecimal.ZERO) > 0) {
+                if (checkqty.compareTo(qty) > 0 && checkqty.compareTo(BigDecimal.ZERO) > 0) {
                     return getErrReturnObject().setErrMsg("该配件核销单数量不符合要求，请检查订单明细数量").toString();
                 }
-                if (canoffqty.compareTo(checkqty) < 0 && checkqty.compareTo(BigDecimal.ZERO) > 0) {
-                    return getErrReturnObject().setErrMsg("该配件核销单数量不符合要求，请检查订单明细可核销数量").toString();
-                }
+
             } else {
                 return getErrReturnObject().setErrMsg("订单行不存在，请检查").toString();
             }