bug修复

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/序列号查询.sql

@@ -3,6 +3,8 @@ select * from ((SELECT
                     t5.contact,
                     t5.phonenumber,
                     t5.address,
+                    t5.enterprisename,
+                    t5.abbreviation,
                     case when ifnull(t6.cardno,'')='' then '未安装' else '已安装' end isinstalled,
                     t6.cardno,
                     t6.begdate,
@@ -40,6 +42,8 @@ select * from ((SELECT
                     t5.contact,
                     t5.phonenumber,
                     t5.address,
+                    t5.enterprisename,
+                    t5.abbreviation,
                     case when ifnull(t6.cardno,'')='' then '未安装' else '已安装' end isinstalled,
                     t6.cardno,
                     t6.begdate,

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

@@ -287,7 +287,7 @@ public class serviceorder extends Controller {
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
         RowsMap attRowsMap = getAttachmentUrl("plm_item", ids);
 
-//        RowsMap warrantycardRowsMap = SQLFactory.createQuerySQL(this, "sa_warrantycard", "sku","name", "phonenumber","address","sa_customersid","province","city","county").setWhere("sku", rows.toArrayList("sku")).query().toRowsMap("sku");
+        RowsMap warrantycardRowsMap = SQLFactory.createQuerySQL(this, "sa_warrantycard", "sku","name", "phonenumber","address","sa_customersid","province","city","county").setWhere("sku", rows.toArrayList("sku")).query().toRowsMap("sku");
 
         for (Row row : rows) {
             if (attRowsMap.getOrDefault(row.getString("itemid"), new Rows()).isNotEmpty()) {
@@ -295,25 +295,25 @@ public class serviceorder extends Controller {
             } else {
                 row.put("attinfos", defaultImageRows);
             }
-//            String sku = row.getString("sku");
-//            if (warrantycardRowsMap.containsKey(sku) && warrantycardRowsMap.get(sku).isNotEmpty()) {
-//                Row warrantycardRow = warrantycardRowsMap.get(sku).get(0);
-//                row.put("name", warrantycardRow.getString("name"));
-//                row.put("phonenumber", warrantycardRow.getString("phonenumber"));
-//                row.put("address", warrantycardRow.getString("address"));
-//                row.put("sa_customersid", warrantycardRow.getLong("sa_customersid"));
-//                row.put("province", warrantycardRow.getString("province"));
-//                row.put("city", warrantycardRow.getString("city"));
-//                row.put("county", warrantycardRow.getString("county"));
-//            }else{
-//                row.put("name", "");
-//                row.put("phonenumber", "");
-//                row.put("address","");
-//                row.put("sa_customersid", "");
-//                row.put("province", "");
-//                row.put("city", "");
-//                row.put("county", "");
-//            }
+            String sku = row.getString("sku");
+            if (warrantycardRowsMap.containsKey(sku) && warrantycardRowsMap.get(sku).isNotEmpty()) {
+                Row warrantycardRow = warrantycardRowsMap.get(sku).get(0);
+                row.put("name", warrantycardRow.getString("name"));
+                row.put("phonenumber", warrantycardRow.getString("phonenumber"));
+                row.put("address", warrantycardRow.getString("address"));
+                row.put("sa_customersid", warrantycardRow.getLong("sa_customersid"));
+                row.put("province", warrantycardRow.getString("province"));
+                row.put("city", warrantycardRow.getString("city"));
+                row.put("county", warrantycardRow.getString("county"));
+            }else{
+                row.put("name", "");
+                row.put("phonenumber", "");
+                row.put("address","");
+                row.put("sa_customersid", "");
+                row.put("province", "");
+                row.put("city", "");
+                row.put("county", "");
+            }
 
         }
 

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

@@ -340,8 +340,8 @@ public class toolscode extends Controller {
         skuQuery.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid", "itemid", "itemno", "itemname", "spec", "model", "topclassnum");
         skuQuery.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t2.unitid=t3.unitid");
         skuQuery.addJoinTable(JOINTYPE.left, "st_stock", "t4", "t4.stockno=t2.stockno");
-        skuQuery.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t1.sys_enterpriseid=t5.sys_enterpriseid", "t5.enterprisename","abbreviation");
-        skuQuery.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t1.sys_enterpriseid=t6.sys_enterpriseid", "t6.agentnum");
+        skuQuery.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t1.sys_enterpriseid=t5.sys_enterpriseid", "enterprisename","abbreviation");
+        skuQuery.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t1.sys_enterpriseid=t6.sys_enterpriseid", "agentnum");
         skuQuery.addJoinTable(JOINTYPE.left, "st_stock", "t7", "t1.stockid=t7.stockid", "stockno", "stockname");
 
         skuQuery.addQueryFields("itemstockno", "t2.stockno");