|
|
@@ -243,6 +243,8 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
}
|
|
|
}
|
|
|
if (maps.size() > 0) {
|
|
|
+ //获取默认收货地址
|
|
|
+ String adCustAddress = baseDao.getDBSetting(caller, "adCustAddress");
|
|
|
// 指定了采购单
|
|
|
if (StringUtil.hasText(maps.get(0).get("pu_code"))) {
|
|
|
code = maps.get(0).get("pu_code");
|
|
|
@@ -313,7 +315,7 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
// 没有指定供应商，按照明细供应商号+币别分组
|
|
|
vCode = map.get("ad_vendor");
|
|
|
Object Currency = map.get("ad_currency");
|
|
|
- String custaddress = "".equals(String.valueOf(map.get("ad_custaddress"))) ? "广东省东莞市大朗镇富民工业城1园10号（二楼3号货梯）" : String.valueOf(map.get("ad_custaddress"));
|
|
|
+ String custaddress = "".equals(String.valueOf(map.get("ad_custaddress"))) ? adCustAddress : String.valueOf(map.get("ad_custaddress"));
|
|
|
if (Currency != null && !Currency.equals("")) {
|
|
|
vCode = vCode + "#" + Currency+"#"+custaddress;
|
|
|
}
|
|
|
@@ -368,7 +370,7 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
// 指定了供应商
|
|
|
if (pointedVendor == null) {
|
|
|
pointedVendor = maps.get(0).get("ap_vendcode").toString();
|
|
|
- String custaddress = "".equals(String.valueOf(map.get("ad_custaddress"))) ? "广东省东莞市大朗镇富民工业城1园10号（二楼3号货梯）" : String.valueOf(map.get("ad_custaddress"));
|
|
|
+ String custaddress = "".equals(String.valueOf(map.get("ad_custaddress"))) ? adCustAddress : String.valueOf(map.get("ad_custaddress"));
|
|
|
Object[] objs = baseDao.getFieldsDataByCondition("Vendor", new String[] { "ve_id", "ve_name", "ve_currency" },
|
|
|
"ve_code='" + pointedVendor + "'");
|
|
|
if (objs == null) {
|
|
|
@@ -461,8 +463,10 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
baseDao.execute("update purchase set pu_getprice=0,pu_mainmark='非标准' where pu_id=" + pu_id);
|
|
|
}
|
|
|
//更新收货人和地址
|
|
|
- if ("广东省东莞市大朗镇富民工业城1园10号（二楼3号货梯）".equals(address)){
|
|
|
- baseDao.execute("update purchase set pu_shipaddresscode='广东省东莞市大朗镇富民工业城1园10号（二楼3号货梯）',pu_vendcontactmobile='龙小艳',pu_vendcontactfax='17807650916' where pu_id=" + pu_id);
|
|
|
+ if (adCustAddress.equals(address)){
|
|
|
+ String adCustContact = baseDao.getDBSetting(caller, "adCustContact");
|
|
|
+ String adCustMobile = baseDao.getDBSetting(caller, "adCustMobile");
|
|
|
+ baseDao.execute("update purchase set pu_shipaddresscode='"+adCustAddress+"',pu_vendcontactmobile='"+adCustContact+"',pu_vendcontactfax='"+adCustMobile+"' where pu_id=" + pu_id);
|
|
|
}else {
|
|
|
String receivename = list.get(0).get("ad_receivename_user") == null ? "" : String.valueOf(list.get(0).get("ad_receivename_user"));
|
|
|
if ("".equals(receivename)){
|
koul