更新订单发货人信息

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

@@ -189,31 +189,13 @@ public class Order extends Controller {
             rec_contactsid = getDefaultContactsid(sys_enterpriseid);
         }
         sqlFactory.addParameter("rec_contactsid", rec_contactsid);
-        Rows contactsrows = dbConnect.runSqlQuery("select * from sys_enterprise_contacts where contactsid="+rec_contactsid);
-        if(isAdd){
-            if(contactsrows.isNotEmpty()){
-                sqlFactory.addParameter("contact", contactsrows.get(0).getString("name"));
-                sqlFactory.addParameter("address", contactsrows.get(0).getString("address"));
-                sqlFactory.addParameter("phonenumber", contactsrows.get(0).getString("phonenumber"));
-                sqlFactory.addParameter("province", contactsrows.get(0).getString("province"));
-                sqlFactory.addParameter("city", contactsrows.get(0).getString("city"));
-                sqlFactory.addParameter("county", contactsrows.get(0).getString("county"));
-            }else{
-                sqlFactory.addParameter("contact", "");
-                sqlFactory.addParameter("address", "");
-                sqlFactory.addParameter("phonenumber", "");
-                sqlFactory.addParameter("province", "");
-                sqlFactory.addParameter("city", "");
-                sqlFactory.addParameter("county", "");
-            }
-        }else{
-            sqlFactory.addParameter("contact",content.getStringValue("name"));
-            sqlFactory.addParameter("address",content.getStringValue("address"));
-            sqlFactory.addParameter("phonenumber", content.getStringValue("phonenumber"));
-            sqlFactory.addParameter("province", content.getStringValue("province"));
-            sqlFactory.addParameter("city", content.getStringValue("city"));
-            sqlFactory.addParameter("county", content.getStringValue("county"));
-        }
+//        Rows contactsrows = dbConnect.runSqlQuery("select * from sys_enterprise_contacts where contactsid="+rec_contactsid);
+        sqlFactory.addParameter("contact",content.getStringValue("name"));
+        sqlFactory.addParameter("address",content.getStringValue("address"));
+        sqlFactory.addParameter("phonenumber", content.getStringValue("phonenumber"));
+        sqlFactory.addParameter("province", content.getStringValue("province"));
+        sqlFactory.addParameter("city", content.getStringValue("city"));
+        sqlFactory.addParameter("county", content.getStringValue("county"));
 
         //备注说明
         sqlFactory.addParameter("remarks", content.getStringValue("remarks"));
@@ -1634,13 +1616,12 @@ public class Order extends Controller {
 
         insertSQL.setValue("outplace", outplace);
         insertSQL.setValue("delivery", orderRow.getString("delivery"));
-        insertSQL.setValue("invoice_enterprisename", enterprisefinancerow.getString("enterprisename"));
-        insertSQL.setValue("invoice_address", enterprisefinancerow.getString("address"));
-        insertSQL.setValue("invoice_taxno", enterprisefinancerow.getString("taxno"));
-        insertSQL.setValue("rec_contactsid", reccontactrow.getString("contactsid"));
-        insertSQL.setValue("name", reccontactrow.getString("name"));
-        insertSQL.setValue("phonenumber", reccontactrow.getString("phonenumber"));
-        insertSQL.setValue("address", reccontactrow.getString("address"));
+        insertSQL.setValue("invoice_enterprisename", orderRow.getString("invoicename"));
+        insertSQL.setValue("invoice_address", orderRow.getString("invoiceaddress"));
+        insertSQL.setValue("invoice_taxno", orderRow.getString("invoicetaxno"));
+        insertSQL.setValue("name", orderRow.getString("contact"));
+        insertSQL.setValue("phonenumber", orderRow.getString("phonenumber"));
+        insertSQL.setValue("address", orderRow.getString("address"));
 
         insertSQL.setValue("tracknumber",enterprisefinancerow.getString(""));
         insertSQL.setValue("isconfirm", 0);
@@ -1755,9 +1736,12 @@ public class Order extends Controller {
 
         insertSQL.setValue("outplace", rowsdetail.get(0).getString("outplace"));
         insertSQL.setValue("delivery", orderRow.getString("delivery"));
-        insertSQL.setValue("invoice_enterprisename", enterprisefinancerow.getString("enterprisename"));
-        insertSQL.setValue("invoice_address", enterprisefinancerow.getString("address"));
-        insertSQL.setValue("invoice_taxno", enterprisefinancerow.getString("taxno"));
+        insertSQL.setValue("invoice_enterprisename", orderRow.getString("invoicename"));
+        insertSQL.setValue("invoice_address", orderRow.getString("invoiceaddress"));
+        insertSQL.setValue("invoice_taxno", orderRow.getString("invoicetaxno"));
+        insertSQL.setValue("name", orderRow.getString("contact"));
+        insertSQL.setValue("phonenumber", orderRow.getString("phonenumber"));
+        insertSQL.setValue("address", orderRow.getString("address"));
         insertSQL.setValue("tracknumber", "");
         insertSQL.setValue("isconfirm", 0);