订单出入库单新增物流方式字段

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

@@ -287,6 +287,7 @@ public class Order extends Controller {
         sqlFactory.addParameter("abstract", content.getStringValue("abstract"));
 
         sqlFactory.addParameter("delivery", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
+        sqlFactory.addParameter("logisticsmethod", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
         sqlFactory.addParameter("tracknumber", content.getStringValue("tracknumber"));
         sqlFactory.addParameter("mailno", content.getStringValue("mailno"));
         sqlFactory.addParameter("submitphonenumber", content.getStringValue("submitphonenumber"));
@@ -515,6 +516,8 @@ public class Order extends Controller {
         sqlFactory.addParameter("tracknumber", content.getStringValue("tracknumber"));
         sqlFactory.addParameter("mailno", content.getStringValue("mailno"));
         sqlFactory.addParameter("submitphonenumber", content.getStringValue("submitphonenumber"));
+        sqlFactory.addParameter("logisticsmethod", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
+
         dbConnect.runSqlUpdate(sqlFactory);
 
         content.put("sa_orderid", sa_orderid);
@@ -1171,7 +1174,7 @@ public class Order extends Controller {
     //查询订单列表(管理端)
     public QuerySQL queryListManage(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
-                "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "rec_contactsid", "delivery", "tracknumber", "mailno"
+                "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "rec_contactsid", "delivery","logisticsmethod", "tracknumber", "mailno"
                 ,"invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber","province","city","county");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid = t1.sys_enterpriseid and t2.siteid = t1.siteid",
@@ -1616,6 +1619,7 @@ public class Order extends Controller {
 
         insertSQL.setValue("outplace", outplace);
         insertSQL.setValue("delivery", orderRow.getString("delivery"));
+        insertSQL.setValue("logisticsmethod", orderRow.getString("logisticsmethod"));
         insertSQL.setValue("invoice_enterprisename", orderRow.getString("invoicename"));
         insertSQL.setValue("invoice_address", orderRow.getString("invoiceaddress"));
         insertSQL.setValue("invoice_taxno", orderRow.getString("invoicetaxno"));
@@ -1736,6 +1740,7 @@ public class Order extends Controller {
 
         insertSQL.setValue("outplace", rowsdetail.get(0).getString("outplace"));
         insertSQL.setValue("delivery", orderRow.getString("delivery"));
+        insertSQL.setValue("logisticsmethod", orderRow.getString("logisticsmethod"));
         insertSQL.setValue("invoice_enterprisename", orderRow.getString("invoicename"));
         insertSQL.setValue("invoice_address", orderRow.getString("invoiceaddress"));
         insertSQL.setValue("invoice_taxno", orderRow.getString("invoicetaxno"));
@@ -1811,7 +1816,7 @@ public class Order extends Controller {
         JSONArray sa_orderids =content.getJSONArray("sa_orderids");
 //        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");
+        QuerySQL orderQuerySQL = SQLFactory.createQuerySQL(this, "sa_order","sa_orderid","sys_enterpriseid","sys_enterprise_financeid","rec_contactsid","logisticsmethod");
         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","remarks","itemno","itemname","model","price","delivery");
@@ -1982,6 +1987,7 @@ public class Order extends Controller {
 
                     insertSQL.setValue("outplace", orderdetailRows.get(0).getString("outplace"));
                     insertSQL.setValue("delivery", orderdetailRows.get(0).getString("delivery"));
+                    insertSQL.setValue("logisticsmethod", orderdetailRows.get(0).getString("logisticsmethod"));
                     insertSQL.setValue("invoice_enterprisename",enterprisefinancerowsMap.containsKey(sys_enterpriseid)?enterprisefinancerowsMap.get(sys_enterpriseid).get(0).getString("enterprisename"):"");
                     insertSQL.setValue("invoice_address",enterprisefinancerowsMap.containsKey(sys_enterpriseid)?enterprisefinancerowsMap.get(sys_enterpriseid).get(0).getString("address"):"");
                     insertSQL.setValue("invoice_taxno",enterprisefinancerowsMap.containsKey(sys_enterpriseid)?enterprisefinancerowsMap.get(sys_enterpriseid).get(0).getString("taxno"):"");

src/custom/restcontroller/webmanage/sale/order/SQL/订单_新增.sql

@@ -3,11 +3,11 @@ insert into sa_order (sa_orderid, siteid, sonum, saler_hrid, type, typemx, sys_e
                       remarks, status, createuserid, createby, createdate, changeuserid, changeby, changedate,
                       createflag, tradefield, pay_enterpriseid, billdate, rebate_used, rebate_userate, signbacknum,
                       tradefieldmx, sa_promotionid, freightstatus, saletype, signbackstatus,projectnote,abstract,delivery,
-                      tracknumber,mailno,invoicetaxno,invoicename,invoiceaddress,contact,address,phonenumber,province,city,county,submitphonenumber)
+                      tracknumber,mailno,invoicetaxno,invoicename,invoiceaddress,contact,address,phonenumber,province,city,county,submitphonenumber,logisticsmethod)
 values ($sa_orderid$, $siteid$, $sonum$, $saler_hrid$, $type$, $typemx$, $sys_enterpriseid$, $sa_accountclassid$,
         $sa_brandid$, $sa_contractid$, $sa_projectid$, $sys_enterprise_financeid$, $rec_contactsid$,
         $remarks$, '新建', $userid$, $username$, current_time, $userid$, $username$, current_time, $createflag$,
         $tradefield$, $pay_enterpriseid$, $billdate$, $rebate_used$,
         (SELECT order_rebate_userate from sys_site_parameter WHERE siteid = $siteid$), $signbacknum$, $tradefieldmx$,
         $sa_promotionid$, $freightstatus$, $saletype$, $signbackstatus$,$projectnote$,$abstract$,$delivery$,
-        $tracknumber$,$mailno$,$invoicetaxno$,$invoicename$,$invoiceaddress$,$contact$,$address$,$phonenumber$,$province$,$city$,$county$,$submitphonenumber$);
+        $tracknumber$,$mailno$,$invoicetaxno$,$invoicename$,$invoiceaddress$,$contact$,$address$,$phonenumber$,$province$,$city$,$county$,$submitphonenumber$,$logisticsmethod$);

src/custom/restcontroller/webmanage/sale/order/SQL/订单_更新.sql

@@ -33,6 +33,7 @@ set changeuserid=$userid$,
     province=$province$,
     city=$city$,
     county=$county$,
-    submitphonenumber=$submitphonenumber$
+    submitphonenumber=$submitphonenumber$,
+    logisticsmethod=$logisticsmethod$
 where siteid = $siteid$
   and sa_orderid = $sa_orderid$

src/custom/restcontroller/webmanage/sale/order/SQL/订单_详情.sql

@@ -12,6 +12,7 @@ SELECT t1.sa_orderid,
        t1.`status`,
        t1.abstract,
        t1.delivery,
+       t1.logisticsmethod,
        t1.tracknumber,
        t1.mailno,
        t1.invoicetaxno,

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

@@ -67,6 +67,7 @@ public class stockbill extends Controller {
         String billdate = content.getStringValue("billdate");
         String outplace = content.getStringValue("outplace");
         String delivery = content.getStringValue("delivery");
+        String logisticsmethod = content.getStringValue("logisticsmethod");
         Rows invoicerows = dbConnect.runSqlQuery("select * from sys_enterprise_finance where sys_enterpriseid=" + sys_enterpriseid + " order by isdefault desc");
         String invoice_enterprisename = content.getStringValue("invoice_enterprisename");
         String invoice_address = content.getStringValue("invoice_address");
@@ -114,6 +115,7 @@ public class stockbill extends Controller {
 
             insertSQL.setValue("outplace", outplace);
             insertSQL.setValue("delivery", delivery);
+            insertSQL.setValue("logisticsmethod", logisticsmethod);
             insertSQL.setValue("invoice_enterprisename", invoice_enterprisename);
             insertSQL.setValue("invoice_address", invoice_address);
             insertSQL.setValue("invoice_taxno", invoice_taxno);
@@ -149,6 +151,7 @@ public class stockbill extends Controller {
                     updateSQL.setValue("billdate", billdate);
                     updateSQL.setValue("outplace", outplace);
                     updateSQL.setValue("delivery", delivery);
+                    updateSQL.setValue("logisticsmethod", logisticsmethod);
                     updateSQL.setValue("invoice_enterprisename", content.getStringValue("invoice_enterprisename"));
                     updateSQL.setValue("invoice_address", content.getStringValue("invoice_address"));
                     updateSQL.setValue("invoice_taxno", content.getStringValue("invoice_taxno"));