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

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -178,7 +178,7 @@ public class OrderItems extends Controller {
 //            int year = Year.now().getValue();
 //            int quarter = YearMonth.now().get(IsoFields.QUARTER_OF_YEAR);
             Rows custamountrows = dbConnect.runSqlQuery("select * from sa_agents where sys_enterpriseid=" + sys_enterpriseid + " and siteid='" + siteid + "'");
-            if(custamountrows.isNotEmpty()){
+            if(custamountrows.isNotEmpty() && !type.equals("配件订单")){
                 if(custamountrows.get(0).getDouble("pricerate")>0){
                     rwpricerate = custamountrows.get(0).getBigDecimal("pricerate");
                 }

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -313,7 +313,8 @@ public class sendplandetail extends Controller {
             String sys_enterpriseid = jsonObject.getString("sys_enterpriseid");
             sys_enterpriseidList.add(sys_enterpriseid);
             String outplace = jsonObject.getString("outplace");
-            key = outplace;
+            String topclassnum = jsonObject.getString("topclassnum");
+            key = outplace+topclassnum;
             HashMap<String, List<JSONObject>> agent = null;
             List<JSONObject> paolist = null;
             if (agentmap.containsKey(sys_enterpriseid)) {

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

@@ -814,7 +814,7 @@ public class serviceorder extends Controller {
         dbConnect.runSqlUpdate("update sa_workorder set verificationcode='"+verificationCode+"' where sa_workorderid="+sa_workorderid);
         Rows wxserviceRows = dbConnect.runSqlQuery("select t2.userid from sys_wechatapp_openids t1 inner join sys_users t2 on t1.userid=t2.userid where t2.phonenumber='"+customerphone+"'");
         Row row = new Row();
-        if(wxserviceRows.isEmpty()){
+        if(wxserviceRows.isNotEmpty()){
             ArrayList<Long> userids = wxserviceRows.toArrayList("userid",new ArrayList<>());
             JSONObject extradata = new JSONObject();
             extradata.put("extraUserList", userids);

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

@@ -384,8 +384,9 @@ public class stockbill extends Controller {
         if (billtypes.contains("返修出库")) {
             querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t10", "t10.sourceid=t1.st_stockbillid and t10.siteid = t1.siteid and t10.sourcetable='st_stockbill'","instockdate");
         }
-
-
+        if(billtypes.contains("返修入库")){
+            //querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model,sku,siteid FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model","sku");
+        }
 
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.type", billtypes);
@@ -416,9 +417,7 @@ public class stockbill extends Controller {
                 }
             }
         }
-        if(billtypes.contains("返修入库")){
-            querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model");
-        }
+
 
 
         return getSucReturnObject().setData(rows).toString();

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

@@ -1063,12 +1063,13 @@ public class workorder extends Controller {
         }
 
         if (rows.get(0).getString("type").equals("安装")) {
-            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.sa_customersid,t5.sa_agentsid customeragentsid,t3.name,t3.phonenumber,t3.province,t3.city,t3.county,t3.address,t1.sku,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid,t3.sys_enterpriseid,t6.sa_agentsid sa_agentsid_to,t6.agentnum toagentnum from sa_serviceorderitems t1 " +
+            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.sa_customersid,t5.sa_agentsid customeragentsid,t3.name,t3.phonenumber,t3.province,t3.city,t3.county,t3.address,t1.sku,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 " +
                     " inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid " +
                     " left join sa_serviceorder t3 on t1.sa_serviceorderid=t3.sa_serviceorderid and t1.siteid=t3.siteid " +
                     " left join sa_agents t4 on t3.sys_enterpriseid=t4.sys_enterpriseid and t3.siteid=t4.siteid " +
                     " left join sa_customers t5 on t5.sa_customersid=t3.sa_customersid and t5.siteid=t3.siteid " +
                     " left join sa_agents t6 on t3.sys_enterpriseid_service=t6.sys_enterpriseid and t3.siteid=t6.siteid " +
+                    " left join sa_itemsku t7 on t7.sku=t1.sku and t7.siteid=t1.siteid " +
                     "where t1.sa_serviceorderid=" + rows.get(0).getLong("sa_serviceorderid") + " and t1.siteid='" + siteid + "' ");
 
             if (itemrows.isNotEmpty()) {
@@ -1102,6 +1103,7 @@ public class workorder extends Controller {
                     insertSQL.setValue("county", itemrows.get(0).getString("county"));
                     insertSQL.setValue("address", itemrows.get(0).getString("address"));
                     insertSQL.setValue("sa_customersid", sa_customersid);
+                    insertSQL.setValue("itemid", itemrows.get(0).getLong("itemid"));
                     sqlList.add(insertSQL.getSQL());
                 }
 
@@ -1124,8 +1126,13 @@ public class workorder extends Controller {
                 insertSQL.setValue("sku", itemrows.get(0).getString("sku"));
                 insertSQL.setValue("cardno", createBillCode("warrantycard"));
                 insertSQL.setValue("sa_customersid", sa_customersid);
+                insertSQL.setValue("name", itemrows.get(0).getString("name"));
+                insertSQL.setValue("phonenumber", itemrows.get(0).getString("phonenumber"));
+                insertSQL.setValue("address", itemrows.get(0).getString("address"));
                 insertSQL.setValue("enddate", formattedDate);
                 insertSQL.setValue("begdate", getDateTime_Str());
+                insertSQL.setValue("itemid",  itemrows.get(0).getLong("itemid"));
+
                 sqlList.add(insertSQL.getSQL());
             }