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

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

@@ -1172,19 +1172,23 @@ public class stockbill extends Controller {
 
         QuerySQL stockbillQuerySQL = SQLFactory.createQuerySQL(this, "st_stockbill","*");
         stockbillQuerySQL.setTableAlias("t1");
-        stockbillQuerySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_contacts", "t2", "t2.contactsid=t1.rec_contactsid and t1.siteid=t2.siteid");
-        stockbillQuerySQL.addQueryFields("rec_name","t2.name");
-        stockbillQuerySQL.addQueryFields("rcv_phone","t2.phonenumber");
-        stockbillQuerySQL.addQueryFields("rcv_mobile","t2.telephone");
-        stockbillQuerySQL.addQueryFields("rcv_prov","t2.province");
-        stockbillQuerySQL.addQueryFields("rcv_city","t2.city");
-        stockbillQuerySQL.addQueryFields("rcv_county","t2.county");
-        stockbillQuerySQL.addQueryFields("rcv_address","t2.address");
+        stockbillQuerySQL.addQueryFields("rev_name","t1.name");
+        stockbillQuerySQL.addQueryFields("rcv_phone","t1.phonenumber");
+        stockbillQuerySQL.addQueryFields("rcv_mobile","t1.phonenumber");
+        stockbillQuerySQL.addQueryFields("rcv_address","t1.address");
 
         stockbillQuerySQL.setWhere("t1.siteid",siteid);
         stockbillQuerySQL.setWhere("t1.st_stockbillid",st_stockbillids);
         stockbillQuerySQL.setWhere("t1.type='销售出库'");
         Rows stockbillRows =stockbillQuerySQL.query();
+
+        QuerySQL orderQuerySQL = SQLFactory.createQuerySQL(this, "sa_order","province","city","county");
+        orderQuerySQL.setTableAlias("t1");
+        orderQuerySQL.addJoinTable(JOINTYPE.inner,"sa_orderitems","t2","t2.sa_orderid=t1.sa_orderid");
+        orderQuerySQL.addJoinTable(JOINTYPE.inner,"st_stockbill_items","t3","t3.sa_orderitemsid=t2.sa_orderitemsid","st_stockbillid");
+        orderQuerySQL.setWhere("t3.st_stockbillid",st_stockbillids);
+        Rows orderRows =orderQuerySQL.query();
+        RowsMap orderrowsMap =orderRows.toRowsMap("st_stockbillid");
         for(Row row :stockbillRows){
             long expressformid = createTableID(tableName);
             InsertSQL insertSQL = SQLFactory.createInsertSQL(this, tableName);
@@ -1197,13 +1201,13 @@ public class stockbill extends Controller {
             insertSQL.setValue("number", 1);
             insertSQL.setValue("fpriority_ads", "配件>常规");
             insertSQL.setValue("sys_enterpriseid", row.getLong("sys_enterpriseid"));
-            insertSQL.setValue("rcv_name", row.getString("rcv_name"));
+            insertSQL.setValue("rcv_name", row.getString("rev_name"));
             insertSQL.setValue("rcv_phone", row.getString("rcv_phone"));
             insertSQL.setValue("rcv_mobile", row.getString("rcv_mobile"));
             insertSQL.setValue("rcv_postcode", "");
-            insertSQL.setValue("rcv_prov", row.getString("rcv_prov"));
-            insertSQL.setValue("rcv_city", row.getString("rcv_city"));
-            insertSQL.setValue("rcv_county", row.getString("rcv_county"));
+            insertSQL.setValue("rcv_prov", orderrowsMap.containsKey(row.getString("st_stockbillid"))?orderrowsMap.get(row.getString("st_stockbillid")).get(0).getString("province"):province);
+            insertSQL.setValue("rcv_city", orderrowsMap.containsKey(row.getString("st_stockbillid"))?orderrowsMap.get(row.getString("st_stockbillid")).get(0).getString("city"):city);
+            insertSQL.setValue("rcv_county", orderrowsMap.containsKey(row.getString("st_stockbillid"))?orderrowsMap.get(row.getString("st_stockbillid")).get(0).getString("county"):city);
             insertSQL.setValue("rcv_address", row.getString("rcv_address"));
             insertSQL.setValue("expresssdrid", expresssdrid);
             insertSQL.setValue("remarks", "");