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