销售出库单新增省市县字段

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

@@ -1645,6 +1645,10 @@ public class Order extends Controller {
         insertSQL.setValue("name", orderRow.getString("contact"));
         insertSQL.setValue("phonenumber", orderRow.getString("phonenumber"));
         insertSQL.setValue("address", orderRow.getString("address"));
+        insertSQL.setValue("province", orderRow.getString("province"));
+        insertSQL.setValue("city", orderRow.getString("city"));
+        insertSQL.setValue("county", orderRow.getString("county"));
+
 
         insertSQL.setValue("tracknumber",enterprisefinancerow.getString(""));
         insertSQL.setValue("isconfirm", 0);
@@ -1806,6 +1810,9 @@ public class Order extends Controller {
         insertSQL.setValue("name", orderRow.getString("contact"));
         insertSQL.setValue("phonenumber", orderRow.getString("phonenumber"));
         insertSQL.setValue("address", orderRow.getString("address"));
+        insertSQL.setValue("province", orderRow.getString("province"));
+        insertSQL.setValue("city", orderRow.getString("city"));
+        insertSQL.setValue("county", orderRow.getString("county"));
         insertSQL.setValue("tracknumber", "");
         insertSQL.setValue("isconfirm", 0);
 
@@ -1896,7 +1903,7 @@ public class Order extends Controller {
         JSONArray noneeddeliverys =content.getJSONArray("noneeddeliverys");
 //        String outplace=content.getString("outplace");
         ArrayList<String> sqlList = new ArrayList<>();
-        QuerySQL orderQuerySQL = SQLFactory.createQuerySQL(this, "sa_order","sa_orderid","sys_enterpriseid","sys_enterprise_financeid","rec_contactsid","logisticsmethod","invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber","remarks");
+        QuerySQL orderQuerySQL = SQLFactory.createQuerySQL(this, "sa_order","sa_orderid","sys_enterpriseid","sys_enterprise_financeid","rec_contactsid","logisticsmethod","invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber","province","city","county","remarks");
         orderQuerySQL.setTableAlias("t1");
         orderQuerySQL.addJoinTable(JOINTYPE.inner, "sa_orderitems", "t2", "t2.sa_orderid=t1.sa_orderid and t1.siteid=t2.siteid",
                 "sa_orderitemsid","itemid","undeliqty","defaultprice","itemno","itemname","model","price","delivery");
@@ -2083,6 +2090,9 @@ public class Order extends Controller {
                     insertSQL.setValue("name", orderdetailRows.get(0).getString("contact"));
                     insertSQL.setValue("phonenumber", orderdetailRows.get(0).getString("phonenumber"));
                     insertSQL.setValue("address", orderdetailRows.get(0).getString("address"));
+                    insertSQL.setValue("province", orderdetailRows.get(0).getString("province"));
+                    insertSQL.setValue("city", orderdetailRows.get(0).getString("city"));
+                    insertSQL.setValue("county", orderdetailRows.get(0).getString("county"));
 
                     insertSQL.setValue("tracknumber", "");
                     insertSQL.setValue("isconfirm", 0);

src/custom/restcontroller/webmanage/sale/sendplan/SQL/销售出库单新增.sql

@@ -1,6 +1,6 @@
 insert into st_stockbill (siteid, st_stockbillid,createby, createdate, billno,billdate,changeby, changedate,checkby,checkdate,sys_enterpriseid,
                           rb,type,remarks,status,departmentid,outplace,rec_contactsid,delivery,logisticsmethod,invoice_enterprisename,invoice_address,
-                          invoice_taxno,name,phonenumber,address)
+                          invoice_taxno,name,phonenumber,address,province,city,county)
 values ($siteid$, $st_stockbillid$,$createby$, $createdate$, $billno$,$billdate$, $changeby$, $changedate$,$checkby$,$checkdate$,$sys_enterpriseid$,
         $rb$,$type$,$remarks$,'新建',$departmentid$,$outplace$,$rec_contactsid$,$delivery$,$logisticsmethod$,$invoice_enterprisename$,$invoice_address$,
-        $invoice_taxno$,$name$,$phonenumber$,$address$);
+        $invoice_taxno$,$name$,$phonenumber$,$address$,$province$,$city$,$county$);

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

@@ -383,6 +383,9 @@ public class sendplandetail extends Controller {
                     sqlFactory.addParameter("name", firstItem.getStringValue("contact"));
                     sqlFactory.addParameter("phonenumber", firstItem.getStringValue("phonenumber"));
                     sqlFactory.addParameter("address", firstItem.getStringValue("address"));
+                    sqlFactory.addParameter("province", firstItem.getString("province"));
+                    sqlFactory.addParameter("city", firstItem.getString("city"));
+                    sqlFactory.addParameter("county", firstItem.getString("county"));
                     sqlFactory.addParameter("remarks", mergeStrings(senddetailpaoit1,";"));
                 } else {
                     sqlFactory.addParameter("outplace", "");
@@ -395,6 +398,9 @@ public class sendplandetail extends Controller {
                     sqlFactory.addParameter("name", "");
                     sqlFactory.addParameter("phonenumber", "");
                     sqlFactory.addParameter("address", "");
+                    sqlFactory.addParameter("province","");
+                    sqlFactory.addParameter("city","");
+                    sqlFactory.addParameter("county", "");
                     sqlFactory.addParameter("remarks", "");
                 }
 
@@ -482,7 +488,7 @@ public class sendplandetail extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_sendplandetail", "sa_sendplanid", "sa_sendplandetailid", "colorflag", "outplace", "sendqty", "willoutqty", "willinqty", "canuseqty");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t2", "t1.siteid = t2.siteid and t1.sa_orderid = t2.sa_orderid", "sonum", "checkdate", "sys_enterpriseid", "sa_orderid", "rec_contactsid", "delivery","logisticsmethod"
-                , "invoicename", "invoiceaddress","invoicetaxno","contact","phonenumber","address","remarks");
+                , "invoicename", "invoiceaddress","invoicetaxno","contact","phonenumber","address","province","city","county","remarks");
         querySQL.addJoinTable(JOINTYPE.left, "sa_orderitems", "t3", "t3.siteid = t1.siteid and t3.sa_orderitemsid = t1.sa_orderitemsid", "rowno", "sa_orderitemsid","custamount");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.siteid = t1.siteid and t4.sa_agentsid = t1.sa_agentsid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.siteid = t4.siteid and t5.sys_enterpriseid = t4.sys_enterpriseid", "enterprisename", "abbreviation");

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

@@ -123,22 +123,37 @@ public class stockbill extends Controller {
             String name = "";
             String phonenumber = "";
             String address = "";
+            String province = "";
+            String city = "";
+            String county = "";
             if (content.getString("rb").equals("1") && type.equals("销售出库")) {
                 if (depname.equals("售后部")) {
                     if (addressrowsMap.containsKey("配件")) {
                         name = addressrowsMap.get("配件").get(0).getString("name");
                         phonenumber = addressrowsMap.get("配件").get(0).getString("phonenumber");
                         address = addressrowsMap.get("配件").get(0).getString("address");
+
+                        province = addressrowsMap.get("配件").get(0).getString("province");
+                        city = addressrowsMap.get("配件").get(0).getString("city");
+                        county = addressrowsMap.get("配件").get(0).getString("county");
                     } else if (addressrowsMap.containsKey("收货")) {
                         name = addressrowsMap.get("收货").get(0).getString("name");
                         phonenumber = addressrowsMap.get("收货").get(0).getString("phonenumber");
                         address = addressrowsMap.get("收货").get(0).getString("address");
+
+                        province = addressrowsMap.get("收货").get(0).getString("province");
+                        city = addressrowsMap.get("收货").get(0).getString("city");
+                        county = addressrowsMap.get("收货").get(0).getString("county");
                     }
                 } else {
                     if (addressrowsMap.containsKey("收货")) {
                         name = addressrowsMap.get("收货").get(0).getString("name");
                         phonenumber = addressrowsMap.get("收货").get(0).getString("phonenumber");
                         address = addressrowsMap.get("收货").get(0).getString("address");
+
+                        province = addressrowsMap.get("收货").get(0).getString("province");
+                        city = addressrowsMap.get("收货").get(0).getString("city");
+                        county = addressrowsMap.get("收货").get(0).getString("county");
                     }
                 }
             }
@@ -146,6 +161,11 @@ public class stockbill extends Controller {
             insertSQL.setValue("name", name);
             insertSQL.setValue("phonenumber", phonenumber);
             insertSQL.setValue("address", address);
+
+            insertSQL.setValue("province", province);
+            insertSQL.setValue("city", city);
+            insertSQL.setValue("county", county);
+
             insertSQL.setValue("outplace", outplace);
             insertSQL.setValue("delivery", delivery);
             insertSQL.setValue("logisticsmethod", logisticsmethod);