Browse Source

物流公司档案新增更新修复

hu 7 months ago
parent
commit
610b1c28cf

+ 3 - 1
src/custom/restcontroller/webmanage/sale/logiscomp/Logiscomp.java

@@ -37,6 +37,7 @@ public class Logiscomp extends Controller {
         Long sys_enterpriseid = content.getLongValue("sys_enterpriseid");
         String name = content.getStringValue("name");
         String kd100id = content.getStringValue("kd100id");
+        boolean isused= content.getBooleanValue("isused");
         long interfacetype =content.getLong("interfacetype");
         ArrayList<String> sqlList = new ArrayList<>();
         Rows enterpriseRows = dbConnect.runSqlQuery("select sys_enterpriseid from sys_enterprise where siteid = '" + siteid + "' and sys_enterpriseid =" + sys_enterpriseid);
@@ -85,7 +86,7 @@ public class Logiscomp extends Controller {
             if (enterpriseidRows.isNotEmpty() &&  interfacetype==1 && enterpriseidRows.get(0).getLong("sa_logiscompid") != sa_logiscompid) {
                 return getErrReturnObject().setErrMsg("企业已存在").toString();
             }
-            if (nameRows.isNotEmpty() &&  interfacetype==2) {
+            if (nameRows.isNotEmpty() &&  interfacetype==2 && nameRows.get(0).getLong("sa_logiscompid") != sa_logiscompid) {
                 return getErrReturnObject().setErrMsg("物流信息已存在").toString();
             }
             sqlFactory = new SQLFactory(this, "物流公司档案更新");
@@ -98,6 +99,7 @@ public class Logiscomp extends Controller {
         sqlFactory.addParameter("kd100id", kd100id);
         sqlFactory.addParameter("interfacetype", interfacetype);
         sqlFactory.addParameter("username", username);
+        sqlFactory.addParameter("isused", isused);
         sqlFactory.addParameter("siteid", siteid);
         sqlList.add(sqlFactory.getSQL());
         dbConnect.runSqlUpdate(sqlList);

+ 1 - 1
src/custom/restcontroller/webmanage/sale/logiscomp/SQL/物流公司档案新增.sql

@@ -1,5 +1,5 @@
 insert into sa_logiscomp (sa_logiscompid, siteid, sys_enterpriseid,
                           kd100id, isused, changeby, changedate,
                           createdate, createby, name,interfacetype)
-values ($sa_logiscompid$, $siteid$, $sys_enterpriseid$, $kd100id$, 1, $username$, current_time, current_time,
+values ($sa_logiscompid$, $siteid$, $sys_enterpriseid$, $kd100id$, $isused$, $username$, current_time, current_time,
         $username$, $name$,$interfacetype$)

+ 1 - 0
src/custom/restcontroller/webmanage/sale/logiscomp/SQL/物流公司档案更新.sql

@@ -3,6 +3,7 @@ set sys_enterpriseid=$sys_enterpriseid$,
     kd100id=$kd100id$,
     changeby=$username$,
     changedate=current_time,
+    isused=$isused$,
     interfacetype=$interfacetype$
 where siteid = $siteid$
   and sa_logiscompid = $sa_logiscompid$