|
@@ -56,6 +56,13 @@ public class expressform extends Controller {
|
|
|
long expresssdrid = content.getLongValue("expresssdrid");
|
|
long expresssdrid = content.getLongValue("expresssdrid");
|
|
|
String mailno = content.getStringValue("mailno");
|
|
String mailno = content.getStringValue("mailno");
|
|
|
|
|
|
|
|
|
|
+ String province = content.getStringValue("province");
|
|
|
|
|
+ String city = content.getStringValue("city");
|
|
|
|
|
+ String county = content.getStringValue("county");
|
|
|
|
|
+ String phonenumber = content.getStringValue("phonenumber");
|
|
|
|
|
+ String address = content.getStringValue("address");
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
if (expressformid <= 0) {
|
|
if (expressformid <= 0) {
|
|
|
String orderby = "";
|
|
String orderby = "";
|
|
|
if (fpriority_ads.equals("配件>常规")) {
|
|
if (fpriority_ads.equals("配件>常规")) {
|
|
@@ -96,8 +103,15 @@ public class expressform extends Controller {
|
|
|
insertSQL.setValue("expresssdrid", expresssdrid);
|
|
insertSQL.setValue("expresssdrid", expresssdrid);
|
|
|
insertSQL.setValue("remarks", remarks);
|
|
insertSQL.setValue("remarks", remarks);
|
|
|
insertSQL.setValue("mailno", mailno);
|
|
insertSQL.setValue("mailno", mailno);
|
|
|
|
|
+ insertSQL.setValue("province", province);
|
|
|
|
|
+ insertSQL.setValue("city", city);
|
|
|
|
|
+ insertSQL.setValue("county", county);
|
|
|
|
|
+ insertSQL.setValue("phonenumber", phonenumber);
|
|
|
|
|
+ insertSQL.setValue("address", address);
|
|
|
|
|
+
|
|
|
insertSQL.setValue("txlogisticid", createBillCode("logisticsbill"));
|
|
insertSQL.setValue("txlogisticid", createBillCode("logisticsbill"));
|
|
|
|
|
|
|
|
|
|
+
|
|
|
insertSQL.setValue("createby", username);
|
|
insertSQL.setValue("createby", username);
|
|
|
insertSQL.setDateValue("createdate");
|
|
insertSQL.setDateValue("createdate");
|
|
|
insertSQL.setValue("changeby", username);
|
|
insertSQL.setValue("changeby", username);
|
|
@@ -134,6 +148,11 @@ public class expressform extends Controller {
|
|
|
updateSQL.setValue("rcv_address", rcv_address);
|
|
updateSQL.setValue("rcv_address", rcv_address);
|
|
|
updateSQL.setValue("remarks", remarks);
|
|
updateSQL.setValue("remarks", remarks);
|
|
|
updateSQL.setValue("mailno", mailno);
|
|
updateSQL.setValue("mailno", mailno);
|
|
|
|
|
+ updateSQL.setValue("province", province);
|
|
|
|
|
+ updateSQL.setValue("city", city);
|
|
|
|
|
+ updateSQL.setValue("county", county);
|
|
|
|
|
+ updateSQL.setValue("phonenumber", phonenumber);
|
|
|
|
|
+ updateSQL.setValue("address", address);
|
|
|
updateSQL.setValue("changeby", username);
|
|
updateSQL.setValue("changeby", username);
|
|
|
updateSQL.setDateValue("changedate");
|
|
updateSQL.setDateValue("changedate");
|
|
|
sqlList.add(updateSQL.getSQL());
|
|
sqlList.add(updateSQL.getSQL());
|
|
@@ -165,7 +184,7 @@ public class expressform extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid",
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid",
|
|
|
"agentnum");
|
|
"agentnum");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "expresssdr", "t4", "t1.expresssdrid = t4.expresssdrid AND t1.siteid = t4.siteid",
|
|
querySQL.addJoinTable(JOINTYPE.left, "expresssdr", "t4", "t1.expresssdrid = t4.expresssdrid AND t1.siteid = t4.siteid",
|
|
|
- "name", "phonenumber", "mobile", "postcode", "province", "city", "county", "address");
|
|
|
|
|
|
|
+ "name", "mobile", "postcode");
|
|
|
|
|
|
|
|
querySQL.setWhere("t1.siteid", siteid);
|
|
querySQL.setWhere("t1.siteid", siteid);
|
|
|
querySQL.setWhere("t1.expressformid", expressformid);
|
|
querySQL.setWhere("t1.expressformid", expressformid);
|
|
@@ -199,7 +218,7 @@ public class expressform extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid",
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid",
|
|
|
"agentnum");
|
|
"agentnum");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "expresssdr", "t4", "t1.expresssdrid = t4.expresssdrid AND t1.siteid = t4.siteid",
|
|
querySQL.addJoinTable(JOINTYPE.left, "expresssdr", "t4", "t1.expresssdrid = t4.expresssdrid AND t1.siteid = t4.siteid",
|
|
|
- "name", "phonenumber", "mobile", "postcode", "province", "city", "county", "address");
|
|
|
|
|
|
|
+ "name", "mobile", "postcode");
|
|
|
|
|
|
|
|
querySQL.setWhere("t1.siteid", siteid);
|
|
querySQL.setWhere("t1.siteid", siteid);
|
|
|
querySQL.setWhere(where);
|
|
querySQL.setWhere(where);
|