aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#167) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/167
This commit is contained in:
heyu 2025-08-26 17:59:20 +08:00
commit 4f32b4ac97
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -166,7 +166,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
sendAddress.setAddressType("1"); sendAddress.setAddressType("1");
sendAddress.setEnterpriseName(emisWaybillSave.getEnterpriseName()); sendAddress.setEnterpriseName(emisWaybillSave.getEnterpriseName());
sendAddress.setEnterpriseTaxId(emisWaybillSave.getEnterpriseTaxId()); sendAddress.setEnterpriseTaxId(emisWaybillSave.getEnterpriseTaxId());
checkAdress(sendAddress); // checkAdress(sendAddress);
// 插入数据 // 插入数据
emisWaybillAjustApply.setApplyDate(new Date()); emisWaybillAjustApply.setApplyDate(new Date());

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -2628,7 +2628,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
// 保存客户收件、寄件地址，开单不要关联客户地址数据 // 保存客户收件、寄件地址，开单不要关联客户地址数据
createCustomerAddressNew(sendAddress); // createCustomerAddressNew(sendAddress);
createCustomerAddress(sendAddress);
createCustomerAddress(recieveAddress); createCustomerAddress(recieveAddress);
emisWaybillSave.setCustomerCode(customerCode); emisWaybillSave.setCustomerCode(customerCode);