bug修复

src/custom/restcontroller/sale/serviceorder/serviceorder.java

@@ -76,10 +76,10 @@ public class serviceorder extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_serviceorder", "*");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename","abbreviation","phonenumber");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t2.sys_enterpriseid = t3.sys_enterpriseid AND t2.siteid = t3.siteid","agentnum");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t4", "t1.sys_enterpriseid_service = t4.sys_enterpriseid AND t1.siteid = t4.siteid","enterprisename","abbreviation","phonenumber");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t5", "t4.sys_enterpriseid = t5.sys_enterpriseid AND t4.siteid = t5.siteid","agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t2.sys_enterpriseid = t3.sys_enterpriseid AND t2.siteid = t3.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t4", "t1.sys_enterpriseid_service = t4.sys_enterpriseid AND t1.siteid = t4.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t5", "t4.sys_enterpriseid = t5.sys_enterpriseid AND t4.siteid = t5.siteid");
         querySQL.addJoinTable(JOINTYPE.left, "(SELECT * FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY sa_serviceorderid ORDER BY sa_serviceorderitemsid ASC) AS rowno FROM sa_serviceorderitems) t WHERE rowno = 1)",
                 "t8", "t8.sa_serviceorderid=t1.sa_serviceorderid and t8.siteid=t1.siteid","itemid","sku","cardno");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t9", "t9.itemid=t8.itemid and t9.siteid=t8.siteid","itemno","itemname","model","spec");
@@ -88,6 +88,11 @@ public class serviceorder extends Controller {
         querySQL.addQueryFields("servicephonenumber","t4.phonenumber");
         querySQL.addQueryFields("serviceagentnum","t5.agentnum");
 
+        querySQL.addQueryFields("jxs_enterprisename","t2.enterprisename");
+        querySQL.addQueryFields("jxs_abbreviation","t2.abbreviation");
+        querySQL.addQueryFields("jxs_phonenumber","t2.phonenumber");
+        querySQL.addQueryFields("jxsagentnum","t3.agentnum");
+
         if (pageSorting.equals("''")) {
             pageSorting = "case when t1.status='新建' then 1 when t1.status='提交' then 2 when t1.status='待分配' then 3 when t1.status='待受理' then 4 when t1.status='拒绝受理' then 5 when t1.status='待服务' then 6  when t1.status='服务中' then 7 when t1.status='已完结' then 8 else 9 end,t1.createdate desc";
         }
@@ -225,8 +230,8 @@ public class serviceorder extends Controller {
         if(rows.isEmpty()){
             return getErrReturnObject().setErrMsg("该服务申请单不存在").toString();
         }
-        if(!rows.get(0).getString("status").equals("待分配") && !rows.get(0).getString("status").equals("手工完结") ){
-            return getErrReturnObject().setErrMsg("非待分配的服务申请单无法分配服务商").toString();
+        if(!rows.get(0).getString("status").equals("待分配") && !rows.get(0).getString("status").equals("手工完结") && !rows.get(0).getString("status").equals("拒绝受理") ){
+            return getErrReturnObject().setErrMsg("非待分配或手工完结或拒绝受理的服务申请单无法分配服务商").toString();
         }
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");
         updateSQL.setUniqueid(sa_serviceorderid);

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -565,6 +565,12 @@ public class Item extends Controller {
                 where.append(" SELECT t1.itemid FROM sa_itemsaleclass t1 INNER JOIN plm_itemclass t2 ON t2.itemclassid=t1.itemclassid AND t2.siteid=t1.siteid WHERE t2.itemclassname LIKE '%" + itemclass + "%' ");
                 where.append(")");
             }
+            if (content.containsKey("sys_enterpriseid")) {
+                if(content.getLong("sys_enterpriseid")>0){
+                    where.append(" and t1.itemid not in (SELECT ifnull(itemid,0) from sys_enterprise_saleclass WHERE sys_enterpriseid = " +
+                            content.getLong("sys_enterpriseid") + " and siteid='" + siteid + "' )");
+                }
+            }
         }
         QuerySQL querySQL = queryList(where.toString());
         querySQL.setPage(pageSize, pageNumber);

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

@@ -1098,9 +1098,9 @@ public class workorder extends Controller {
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid=t2.siteid","itemid","itemno","itemname","model","spec");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t3.unitid=t2.unitid and t3.siteid=t2.siteid","unitname");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid","agentnum");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid","enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid","cardno","begdate","enddate","name","phonenumber");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t6.sa_agentsid and t4.siteid=t6.siteid","agentnum","sa_agentsid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid","enterprisename","abbreviation","sys_enterpriseid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid","sa_customersid");
         querySQL.addQueryFields("customername","t7.name");
         querySQL.addQueryFields("customerphonenumber","t7.phonenumber");

src/resources/application.yaml

@@ -9,7 +9,7 @@ system:
   db:
     driver: "com.mysql.cj.jdbc.Driver"
     username: "root"
-    password: "rootroot"
-    url: "jdbc:mysql://127.0.0.1:3306/mdyos"
+    password: "123456"
+    url: "jdbc:mysql://127.0.0.1:3306/yos3"
     #url: jdbc:mysql://host.docker.internal:3306/yos3
     servicename: "mysql80"