Merge remote-tracking branch 'origin/develop' into develop

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

@@ -77,7 +77,7 @@ public class serviceorder extends Controller {
         if (content.containsKey("servicetype")) {
             if (content.getString("servicetype").equals("安装")) {
                 if (StringUtils.isBlank(sku)) {
-                    return getErrReturnObject().setErrMsg("安装服务单需添加序列号").toString();
+                    //return getErrReturnObject().setErrMsg("安装服务单需添加序列号").toString();
                 }
                 if (dbConnect.runSqlQuery("select * from sa_warrantycard where sku='" + sku + "' and siteid='" + siteid + "'").isNotEmpty()) {
                     DataTag.createSystemTag(this, "sa_serviceorder", sa_serviceorderid, "重复安装");
@@ -250,12 +250,34 @@ 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");
+
         for (Row row : rows) {
             if (attRowsMap.getOrDefault(row.getString("itemid"), new Rows()).isNotEmpty()) {
                 row.put("attinfos", attRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             } 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", "");
+            }
+
         }
 
         return getSucReturnObject().setData(rows).toString();

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

@@ -362,12 +362,35 @@ public class toolscode extends Controller {
         Rows skuRows = skuQuery.query();
         if (skuRows.isNotEmpty()) {
             RowsMap skuChangeRowsMap = SQLFactory.createQuerySQL(this, "sa_itemsku_change", "sa_itemskuid", "changenotes").setWhere("sa_itemskuid", skuRows.toArrayList("sa_itemskuid")).setOrderBy("sa_itemsku_changeid desc").query().toRowsMap("sa_itemskuid");
+            RowsMap warrantycardRowsMap = SQLFactory.createQuerySQL(this, "sa_warrantycard", "sku","name", "phonenumber","address","sa_customersid","province","city","county").setWhere("sku", skuRows.toArrayList("sku")).query().toRowsMap("sku");
+
             for (Row skuRow : skuRows) {
                 String sa_itemskuid = skuRow.getString("sa_itemskuid");
+                String sku = skuRow.getString("sku");
+
                 if (skuChangeRowsMap.containsKey(sa_itemskuid) && skuChangeRowsMap.get(sa_itemskuid).isNotEmpty()) {
                     Row changeNoteRow = skuChangeRowsMap.get(sa_itemskuid).get(0);
                     skuRow.put("changenotes", changeNoteRow.getString("changenotes"));
                 }
+
+                if (warrantycardRowsMap.containsKey(sku) && warrantycardRowsMap.get(sku).isNotEmpty()) {
+                    Row warrantycardRow = warrantycardRowsMap.get(sku).get(0);
+                    skuRow.put("name", warrantycardRow.getString("name"));
+                    skuRow.put("phonenumber", warrantycardRow.getString("phonenumber"));
+                    skuRow.put("address", warrantycardRow.getString("address"));
+                    skuRow.put("sa_customersid", warrantycardRow.getLong("sa_customersid"));
+                    skuRow.put("province", warrantycardRow.getString("province"));
+                    skuRow.put("city", warrantycardRow.getString("city"));
+                    skuRow.put("county", warrantycardRow.getString("county"));
+                }else{
+                    skuRow.put("name", "");
+                    skuRow.put("phonenumber", "");
+                    skuRow.put("address","");
+                    skuRow.put("sa_customersid", "");
+                    skuRow.put("province", "");
+                    skuRow.put("city", "");
+                    skuRow.put("county", "");
+                }
             }
         }
         return getSucReturnObject().setData(skuRows).toString();

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

@@ -1063,7 +1063,9 @@ public class workorder extends Controller {
         }
 
         if (rows.get(0).getString("type").equals("安装")) {
-            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.scenecontact,t3.scenecontactphonenumber,t3.sa_customersid,t5.sa_agentsid customeragentsid,case when t3.sa_customersid!=0 then t5.name else t3.name end name,case when t3.sa_customersid!=0 then t5.phonenumber else t3.phonenumber end phonenumber,t3.province,t3.city,t3.county, case when t3.sa_customersid!=0 then t5.address else t3.address end address,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid,t3.sys_enterpriseid,t6.sa_agentsid sa_agentsid_to,t6.agentnum toagentnum,t7.itemid from sa_serviceorderitems t1  \n" +
+            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.scenecontact,t3.scenecontactphonenumber,t3.sa_customersid,t5.sa_agentsid customeragentsid," +
+                    "case when t3.sa_customersid!=0 then t5.name else t3.name end name,case when t3.sa_customersid!=0 then t5.phonenumber else t3.phonenumber end phonenumber," +
+                    "t3.province,t3.city,t3.county, case when t3.sa_customersid!=0 then t5.address else t3.address end address,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid,t3.sys_enterpriseid,t6.sa_agentsid sa_agentsid_to,t6.agentnum toagentnum,t7.itemid from sa_serviceorderitems t1  \n" +
                     "                     inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  \n" +
                     "                     left join sa_serviceorder t3 on t1.sa_serviceorderid=t3.sa_serviceorderid and t1.siteid=t3.siteid  \n" +
                     "                     left join sa_agents t4 on t3.sys_enterpriseid=t4.sys_enterpriseid and t3.siteid=t4.siteid  \n" +
@@ -1134,6 +1136,9 @@ public class workorder extends Controller {
                 insertSQL.setValue("name", itemrows.get(0).getString("scenecontact"));
                 insertSQL.setValue("phonenumber", itemrows.get(0).getString("scenecontactphonenumber"));
                 insertSQL.setValue("address", itemrows.get(0).getString("address"));
+                insertSQL.setValue("province", itemrows.get(0).getString("province"));
+                insertSQL.setValue("city", itemrows.get(0).getString("city"));
+                insertSQL.setValue("county", itemrows.get(0).getString("county"));
                 insertSQL.setValue("enddate", formattedDate);
                 insertSQL.setValue("begdate", getDateTime_Str());
                 insertSQL.setValue("itemid",  itemrows.get(0).getLong("itemid"));