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

md

Browse Source
This commit is contained in:
linfso 2024-09-11 15:49:40 +08:00
parent 70de3b16c6
commit 22281e01ee
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -947,7 +947,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setOrderSn(emisWaybillOld.getOrderSn()); emisWaybillSave.setOrderSn(emisWaybillOld.getOrderSn());
// 设定开单时间为当前时间 // 设定开单时间为当前时间
emisWaybillSave.setSendDate(new Date()); emisWaybillSave.setSendDate(new Date());
// 开始接单 // 开始接单
confirmOrder(emisWaybillOld,emisWaybillSave); confirmOrder(emisWaybillOld,emisWaybillSave);
@ -1748,11 +1747,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setOrderDate(emisWaybillSave.getSendDate()); emisWaybillSave.setOrderDate(emisWaybillSave.getSendDate());
} }
// 订单类型为正式单,系统开单
if(isNew) {
// emisWaybillSave.setOrderType("1");
}
// 发件地址 // 发件地址
EmisCustomerAddress sendAddress = new EmisCustomerAddress(); EmisCustomerAddress sendAddress = new EmisCustomerAddress();
sendAddress.setCountry(emisWaybillSave.getSendCountry()); sendAddress.setCountry(emisWaybillSave.getSendCountry());
@ -1769,7 +1763,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
sendAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode()); sendAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
sendAddress.setAddressType("1"); sendAddress.setAddressType("1");
// 收件地址 // 收件地址
EmisCustomerAddress recieveAddress = new EmisCustomerAddress(); EmisCustomerAddress recieveAddress = new EmisCustomerAddress();
recieveAddress.setCountry(emisWaybillSave.getReceiveCountry()); recieveAddress.setCountry(emisWaybillSave.getReceiveCountry());
@ -2523,7 +2516,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
*/ */
private void addNewWaybillByOms(EmisWaybill emisWaybillSave) throws EmisBizError { private void addNewWaybillByOms(EmisWaybill emisWaybillSave) throws EmisBizError {
// 设定为客户下单 // 设定为客户下单
emisWaybillSave.setOrderType("0"); emisWaybillSave.setOrderType("0");
@ -2597,6 +2589,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
// api 开单
emisWaybillSave.setOrderType("1");
// 公共计算部分 // 公共计算部分
calcWayBillCommonInfoByApi(emisWaybillSave,true); calcWayBillCommonInfoByApi(emisWaybillSave,true);