浏览代码

bug修复

hxh 4 月之前
父节点
当前提交
93597f1798

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

@@ -316,7 +316,7 @@ public class tpartreimbursement extends Controller {
             }
 
         }
-        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");
@@ -359,6 +359,18 @@ public class tpartreimbursement extends Controller {
         updateSQL.setValue("status", "审核");
         updateSQL.setValue("checkby", username);
         updateSQL.setDateValue("checkdate");
+        int count=0;
+        for(Row row :rowsdetail){
+            if(row.getBigDecimal("checkqty").compareTo(BigDecimal.ZERO)==0){
+                sqlList.add("update sa_tpartreimbursementdetail set isverified=1 where sa_tpartreimbursementdetailid="+row.getLong("sa_tpartreimbursementdetailid"));
+                count++;
+            }
+        }
+
+        if(rowsdetail.size()==count){
+            updateSQL.setValue("status", "关闭");
+        }
+
 
         sqlList.add(updateSQL.getSQL());
         dbConnect.runSqlUpdate(sqlList);

+ 2 - 2
src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursementdetail.java

@@ -25,10 +25,10 @@ public class tpartreimbursementdetail extends Controller {
     @API(title = "查询经销商", apiversion = R.ID2025122016411103.v1.class)
     @CACHEING
     public String queryAgents() throws YosException {
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_tpartreimbursement");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_tpartreimbursement","sys_enterpriseid");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid", "agentnum");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t1.siteid = t3.siteid and t1.sys_enterpriseid = t3.sys_enterpriseid", "sys_enterpriseid", "enterprisename","abbreviation");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t1.siteid = t3.siteid and t1.sys_enterpriseid = t3.sys_enterpriseid", "enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "(select GROUP_CONCAT(t1.areanum) areanum,GROUP_CONCAT(t1.areaname) areaname,GROUP_CONCAT(t1.areafullname) areafullname,t2.sys_enterpriseid,t2.siteid from sa_salearea t1 inner join sys_enterprise_tradefield t2 on t1.sa_saleareaid=t2.sa_saleareaid group by t2.sys_enterpriseid,t2.siteid)", "t4", "t4.sys_enterpriseid=t1.sys_enterpriseid and t4.siteid = t1.siteid",
                 "areanum","areaname","areafullname");
         querySQL.setSiteid(siteid);