Browse Source

核销单增加关闭状态

hxh 4 months ago
parent
commit
cdd119d8d1

+ 2 - 1
src/custom/beans/stockbill/bills/XSCK.java

@@ -295,7 +295,7 @@ public class XSCK extends BasicBill {
                         }
                     }
                 }else{
-                    QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sa_tpartreimbursementdetail", "sa_tpartreimbursementdetailid","isverified","qty","sa_orderitemsid");
+                    QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sa_tpartreimbursementdetail", "sa_tpartreimbursementid","sa_tpartreimbursementdetailid","isverified","qty","sa_orderitemsid");
                     querySQL.setTableAlias("t1");
                     querySQL.addJoinTable(BaseClass.JOINTYPE.inner, "sa_tpartreimbursement", "t3", "t1.sa_tpartreimbursementid = t3.sa_tpartreimbursementid AND t1.siteid = t3.siteid");
                     querySQL.setSiteid(siteid);
@@ -314,6 +314,7 @@ public class XSCK extends BasicBill {
 
                     for (Row row : rows) {
                         sqlList.add("update sa_tpartreimbursementdetail set isverified=0 where sa_tpartreimbursementdetailid=" + row.getLong("sa_tpartreimbursementdetailid"));
+                        sqlList.add("update sa_tpartreimbursement set status='审核' where sa_tpartreimbursementid=" + row.getLong("sa_tpartreimbursementid"));
                     }
                     for (Row row : rowsgroup) {
                         sqlList.add("update sa_orderitems set verifiedqty=ifnull(verifiedqty,0)-"+row.getBigDecimal("sumqty")+" where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));

+ 18 - 1
src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursement.java

@@ -501,11 +501,12 @@ public class tpartreimbursement extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementdetailid","isverified","qty","sa_orderitemsid","hongbillno");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_tpartreimbursement", "t3", "t1.sa_tpartreimbursementid = t3.sa_tpartreimbursementid AND t1.siteid = t2.siteid","billno");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_tpartreimbursement", "t3", "t1.sa_tpartreimbursementid = t3.sa_tpartreimbursementid AND t1.siteid = t2.siteid","sa_tpartreimbursementid","billno");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sa_tpartreimbursementdetailid", sa_tpartreimbursementdetailids);
         Rows rows = querySQL.query();
         ArrayList<String> billnolist = rows.toArrayList("hongbillno");
+        ArrayList<String> sa_tpartreimbursementidList = rows.toArrayList("sa_tpartreimbursementid");
         billnolist.add("111");
         QuerySQL stockbillquerySQL = SQLFactory.createQuerySQL(this, "st_stockbill", "billno");
         stockbillquerySQL.setTableAlias("t1");
@@ -682,7 +683,23 @@ public class tpartreimbursement extends Controller {
                     .toString();
         }
 
+        sqllist=new ArrayList<>();
+        QuerySQL tpartreimbursementSQL = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail","*");
+        tpartreimbursementSQL.setTableAlias("t1");
+        tpartreimbursementSQL.setSiteid(siteid);
+        tpartreimbursementSQL.setWhere("t1.sa_tpartreimbursementid", sa_tpartreimbursementidList);
+        Rows tpartreimbursementrows= tpartreimbursementSQL.query();
+        RowsMap tpartreimbursementrowsMap = tpartreimbursementrows.toRowsMap("sa_tpartreimbursementid");
+        for(String sa_tpartreimbursementid :sa_tpartreimbursementidList){
+            if(tpartreimbursementrowsMap.containsKey(sa_tpartreimbursementid)){
+                if(tpartreimbursementrowsMap.get(sa_tpartreimbursementid).size()
+                        ==tpartreimbursementrowsMap.get(sa_tpartreimbursementid).toRowsMap("isverified").get("1").size()){
+                    sqllist.add("update sa_tpartreimbursement set status='关闭' where sa_tpartreimbursementid= ='"+sa_tpartreimbursementid+"'");
+                }
 
+            }
+        }
+        dbConnect.runSqlUpdate(sqllist);
 
         return getSucReturnObject().toString();
     }