Merge branch 'develop' into develop_green

# Conflicts:
#	src/custom/restcontroller/R.java

src/custom/beans/hr/Hr.java

@@ -187,7 +187,7 @@ public class Hr extends BaseClass {
                     userids.add(row.getLong("createuserid"));
                 }
             }
-            String sql = "SELECT t1.sys_enterpriseid from (SELECT * from   sys_enterprise_tradefield WHERE sys_enterpriseid in  (SELECT sys_enterpriseid from sa_agents WHERE `status` = '启用')) t1 left join sys_hr t2 on t1.hrid=t2.hrid and t1.siteid=t2.siteid WHERE t1.hrid = " + hrid
+            String sql = "SELECT t1.sys_enterpriseid from (SELECT * from   sys_enterprise_tradefield WHERE sys_enterpriseid in  (SELECT sys_enterpriseid from sa_agents WHERE `status` = '1')) t1 left join sys_hr t2 on t1.hrid=t2.hrid and t1.siteid=t2.siteid WHERE t1.hrid = " + hrid
                     + " and t1.siteid = '" + controller.siteid + "' and t2.userid in" + userids;
             sql = sql.replace("[", "(").replace("]", ")");
             rows = controller.dbConnect.runSqlQuery(sql);

src/custom/common/crm/bean/agent.java

@@ -29,7 +29,7 @@ public class agent extends CrmBase {
             QuerySQL querySQL = SQLFactory.createQuerySQL(dbConnect, "sa_agents", "agentnum").setTableAlias("t1");
             querySQL.setWhere("t1.sa_agentsid", datasync.ownerid);
             Rows agentRows = querySQL.query();
-            if (agentRows.isNotEmpty() && !agentRows.get(0).getString("agentnum").isEmpty() && agentRows.get(0).getString("status").equals("启用")) {
+            if (agentRows.isNotEmpty() && !agentRows.get(0).getString("agentnum").isEmpty() && agentRows.get(0).getString("status").equals("1")) {
                 String agentnum = agentRows.get(0).getString("agentnum");
                 if (oneAction(agentnum)) {
                     datasync.suc();

src/custom/restcontroller/R.java

@@ -6992,6 +6992,14 @@ public class R {
         public static class v1 {
         }
     }
+    public static class ID20251222095103 {
+        public static class v1 {
+        }
+    }
+    public static class ID20251222095203 {
+        public static class v1 {
+        }
+    }
 
 }
 

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

@@ -696,7 +696,7 @@ public class aftersalesmag extends Controller {
 //                    .toString();
 //        }
         Long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
-        if (dbConnect.runSqlQuery("SELECT 1 from sa_agents WHERE sys_enterpriseid=" + sys_enterpriseid + " and status='启用'").isEmpty()) {
+        if (dbConnect.runSqlQuery("SELECT 1 from sa_agents WHERE sys_enterpriseid=" + sys_enterpriseid + " and status='1'").isEmpty()) {
             return getErrReturnObject().setErrMsg("经销商已禁用，请启用后再试。").toString();
         }
 

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

@@ -20,9 +20,12 @@ import org.apache.poi.ss.usermodel.DataFormat;
 import org.apache.poi.xssf.usermodel.*;
 import restcontroller.R;
 import restcontroller.webmanage.executorService.Executor;
+import restcontroller.webmanage.sale.bankabcxccard.bankabcxccard;
 import restcontroller.webmanage.sale.enterprisesaleclass.EnterpriseSaleClass;
 import restcontroller.webmanage.sale.enterprisetradefield.EnterpriseTradeField;
 import restcontroller.webmanage.sale.salearea.salearea;
+import restcontroller.webmanage.sale.tpartreimbursement.tpartreimbursement;
+import restcontroller.webmanage.sale.tpartreimbursement.tpartreimbursementdetail;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -420,6 +423,54 @@ public class agents extends Controller {
         return batchDeleteErr.getReturnObject().toString();
     }
 
+
+    @API(title = "经销商虚拟账户新增", apiversion = R.ID20251222095103.v1.class)
+    @CACHEING_CLEAN(apiClass = {agents.class, bankabcxccard.class})
+    public String insertormodify_agentXnAbcCard() throws YosException {
+        ArrayList<String> sqlList = new ArrayList<>();
+        long sa_bankabcxccardid=content.getLong("sa_bankabcxccardid");
+        String xncardnoabc = content.getString("xncardnoabc");
+        long sa_agentsid = content.getLong("sa_agentsid");
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_bankabcxccard");
+        updateSQL.setUniqueid(sa_bankabcxccardid);
+        updateSQL.setSiteid(siteid);
+        updateSQL.setValue("sa_agentsid", sa_agentsid);
+        updateSQL.setValue("isused", 1);
+        updateSQL.setValue("createby", username);
+        updateSQL.setDateValue("createdate");
+        updateSQL.setValue("changeby", username);
+        updateSQL.setDateValue("changedate");
+        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "新增", "经销商虚拟账户【"+xncardnoabc+"】新增成功").getSQL());
+        sqlList.add(updateSQL.getSQL());
+        dbConnect.runSqlUpdate(sqlList);
+        return getSucReturnObject().toString();
+    }
+
+
+    @API(title = "经销商虚拟账户删除", apiversion = R.ID20251222095203.v1.class)
+    @CACHEING_CLEAN(apiClass = {agents.class, bankabcxccard.class})
+    public String delete_agentXnAbcCard() throws YosException {
+        ArrayList<String> sqlList = new ArrayList<>();
+        long sa_bankabcxccardid=content.getLong("sa_bankabcxccardid");
+        String xncardnoabc = content.getString("xncardnoabc");
+        long sa_agentsid = content.getLong("sa_agentsid");
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_bankabcxccard");
+        updateSQL.setUniqueid(sa_bankabcxccardid);
+        updateSQL.setSiteid(siteid);
+        updateSQL.setValue("sa_agentsid", 0);
+        updateSQL.setValue("isused", 0);
+        updateSQL.setValue("createby", username);
+        updateSQL.setDateValue("createdate");
+        updateSQL.setValue("changeby", username);
+        updateSQL.setDateValue("changedate");
+        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "删除", "经销商虚拟账户【"+xncardnoabc+"】删除成功").getSQL());
+        sqlList.add(updateSQL.getSQL());
+        dbConnect.runSqlUpdate(sqlList);
+        return getSucReturnObject().toString();
+    }
+
+
+
     @API(title = "经销商联系人信息及地址信息新增修改", apiversion = R.ID20221009155703.v1.class)
     @CACHEING_CLEAN(apiversions = R.ID20221009155803.v1.class)
     public String insertormodify_agentEnterpriseContacts() throws YosException {

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

@@ -38,6 +38,9 @@ public class bankabcxccard extends Controller {
             if (whereObject.containsKey("isused") && !"".equals(whereObject.getString("isused"))) {
                 where.append(" and t1.isused ='").append(whereObject.getString("isused")).append("' ");
             }
+            if (whereObject.containsKey("isnoagent") && !"".equals(whereObject.getString("isnoagent"))) {
+                where.append(" and t1.isused =0  and ifnull(t1.sa_agentsid,0) =0");
+            }
         }
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_bankabcxccard", "*");
         querySQL.setTableAlias("t1");

src/custom/restcontroller/webmanage/sale/enterprise/SQL/商户档案详情查询.sql

@@ -11,6 +11,7 @@ select t1.siteid,
        t1.province,
        t1.contact,
        t1.enterprisename,
+       t1.abbreviation,
        t1.taxno,
        t1.limitreturnday,
        t1.freefreightamount,

src/custom/restcontroller/webmanage/sale/project/ProjectParties.java

@@ -265,7 +265,7 @@ public class ProjectParties extends Controller {
             //是否打上经销或直销标签
             dbConnect.runSqlUpdate("DELETE from sys_datatag WHERE  ownertable='sa_project' and siteid = '" + siteid + "' and ownerid= " + sa_projectid + " and tag in ('直销','经销','居间')");
 
-            String sql = "SELECT * from sa_agents WHERE sys_enterpriseid in " + sys_enterpriseid + " and siteid = '" + siteid + "' and `status`='启用'";
+            String sql = "SELECT * from sa_agents WHERE sys_enterpriseid in " + sys_enterpriseid + " and siteid = '" + siteid + "' and `status`='1'";
             sql = sql.replace("[", "(").replace("]", ")");
             if (dbConnect.runSqlQuery(sql).isNotEmpty()) {
                 DataTag.createTag(this, "sa_project", sa_projectid, "经销");

src/custom/restcontroller/webmanage/sale/promotion/SQL/经销商合作企业查询.sql

@@ -15,6 +15,6 @@ select t1.sys_enterpriseid,
        t2.createdate,
        t2.status
 from sys_enterprise t1
-         inner join sa_agents t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid  and t2.status='启用'
+         inner join sa_agents t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid  and t2.status='1'
 where t1.siteid = $siteid$
   and $where$ and t1.sys_enterpriseid not in (select sys_enterpriseid from sa_promotion_auth where sa_promotionid=$sa_promotionid$)

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

@@ -190,6 +190,7 @@ public class tpartreimbursementdetail extends Controller {
     }
 
     @API(title = "修改可审核数量", apiversion = R.ID2025112908531803.v1.class)
+    @CACHEING_CLEAN(apiClass = {tpartreimbursement.class, tpartreimbursementdetail.class})
     public String changecheckqty() throws YosException {
         Long sa_tpartreimbursementid = content.getLong("sa_tpartreimbursementid");
         Long sa_tpartreimbursementdetailid = content.getLong("sa_tpartreimbursementdetailid");

src/custom/restcontroller/webmanage/sale/writeoffbill/SQL/可添加企业查询.sql

@@ -12,5 +12,5 @@ select t1.sa_agentsid,
 from sa_agents t1
          inner join sys_enterprise t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid
 where t1.siteid = $siteid$
-  and t1.status = '启用'
+  and t1.status = '1'
   and $where$