bug修复

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

@@ -340,15 +340,15 @@ 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){
-                    return getErrReturnObject().setErrMsg("该配件核销单数量不符合要求，请检查").toString();
-                }
-            }else{
-                return getErrReturnObject().setErrMsg("订单行不存在，请检查").toString();
-            }
-        }
+//        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){
+//                    return getErrReturnObject().setErrMsg("该配件核销单数量不符合要求，请检查").toString();
+//                }
+//            }else{
+//                return getErrReturnObject().setErrMsg("订单行不存在，请检查").toString();
+//            }
+//        }
 
         ArrayList<String> sqlList = new ArrayList<>();
         sqlList.add(
@@ -433,7 +433,7 @@ public class tpartreimbursement extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t8", "t8.sys_enterpriseid = t6.sys_enterpriseid AND t8.siteid = t6.siteid", "agentnum");
 
         querySQL.setSiteid(siteid);
-        querySQL.setWhere("t6.status='审核' and t1.isverified=0 and t6.sys_enterpriseid=" + sys_enterpriseid);
+        querySQL.setWhere("t6.status='审核' and t1.isverified=0 and t1.checkqty>0 and t6.sys_enterpriseid=" + sys_enterpriseid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();

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

@@ -34,6 +34,7 @@ public class tpartreimbursementdetail extends Controller {
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t2.status='1'");
         querySQL.setWhere("t1.status='审核' and  exists(select * from sa_tpartreimbursementdetail where sa_tpartreimbursementid=t1.sa_tpartreimbursementid and isverified=0)");
+        querySQL.setDistinct(true);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
         ArrayList sys_enterpriseidList = rows.toArrayList("sys_enterpriseid");