|
|
@@ -163,15 +163,22 @@ public class Order extends Controller {
|
|
|
}
|
|
|
Rows enterprisefinancerows = dbConnect.runSqlQuery("select * from sys_enterprise_finance where sys_enterprise_financeid="+sys_enterprise_financeid);
|
|
|
sqlFactory.addParameter("sys_enterprise_financeid", sys_enterprise_financeid);
|
|
|
- if(enterprisefinancerows.isNotEmpty()){
|
|
|
- sqlFactory.addParameter("invoicetaxno", enterprisefinancerows.get(0).getString("taxno"));
|
|
|
- sqlFactory.addParameter("invoicename", enterprisefinancerows.get(0).getString("enterprisename"));
|
|
|
- sqlFactory.addParameter("invoiceaddress", enterprisefinancerows.get(0).getString("address"));
|
|
|
+ if(isAdd){
|
|
|
+ if(enterprisefinancerows.isNotEmpty()){
|
|
|
+ sqlFactory.addParameter("invoicetaxno", enterprisefinancerows.get(0).getString("taxno"));
|
|
|
+ sqlFactory.addParameter("invoicename", enterprisefinancerows.get(0).getString("enterprisename"));
|
|
|
+ sqlFactory.addParameter("invoiceaddress", enterprisefinancerows.get(0).getString("address"));
|
|
|
+ }else{
|
|
|
+ sqlFactory.addParameter("invoicetaxno", "");
|
|
|
+ sqlFactory.addParameter("invoicename", "");
|
|
|
+ sqlFactory.addParameter("invoiceaddress", "");
|
|
|
+ }
|
|
|
}else{
|
|
|
- sqlFactory.addParameter("invoicetaxno", "");
|
|
|
- sqlFactory.addParameter("invoicename", "");
|
|
|
- sqlFactory.addParameter("invoiceaddress", "");
|
|
|
+ sqlFactory.addParameter("invoicetaxno", content.getStringValue("invoicetaxno"));
|
|
|
+ sqlFactory.addParameter("invoicename",content.getStringValue("invoicename"));
|
|
|
+ sqlFactory.addParameter("invoiceaddress", content.getStringValue("invoiceaddress"));
|
|
|
}
|
|
|
+
|
|
|
//物流公司档案ID
|
|
|
sqlFactory.addParameter("sa_logiscompid", content.getLongValue("sa_logiscompid"));
|
|
|
//合作企业联系人表ID(收货信息)
|
|
|
@@ -182,21 +189,31 @@ public class Order extends Controller {
|
|
|
}
|
|
|
sqlFactory.addParameter("rec_contactsid", rec_contactsid);
|
|
|
Rows contactsrows = dbConnect.runSqlQuery("select * from sys_enterprise_contacts where contactsid="+rec_contactsid);
|
|
|
- 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"));
|
|
|
+ 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", "");
|
|
|
- sqlFactory.addParameter("address", "");
|
|
|
- sqlFactory.addParameter("phonenumber", "");
|
|
|
- sqlFactory.addParameter("province", "");
|
|
|
- sqlFactory.addParameter("city", "");
|
|
|
- sqlFactory.addParameter("county", "");
|
|
|
+ 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"));
|
|
|
//销售人员hrid,业务员hrid
|