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 647e9a46f..bad35ba0b 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 @@ -1413,8 +1413,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 下单时间 emisWaybillSave.setOrderDate(emisWaybillSave.getSendDate()); - // 订单类型 0-客户下单 1-系统开单 2-预录单 - emisWaybillSave.setOrderType("0"); // 寄件地址 EmisCustomerAddress sendAddress = new EmisCustomerAddress(); @@ -1752,7 +1750,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 订单类型为正式单,系统开单 if(isNew) { - emisWaybillSave.setOrderType("1"); +// emisWaybillSave.setOrderType("1"); } // 发件地址 @@ -2160,9 +2158,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } // 订单类型为正式单,系统开单 - if(isNew) { - emisWaybillSave.setOrderType("1"); - } +// if(isNew) { +// emisWaybillSave.setOrderType("1"); +// } // 发件地址 EmisCustomerAddress sendAddress = new EmisCustomerAddress(); @@ -2383,6 +2381,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } + // 设定为业务开单 + emisWaybillSave.setOrderType("1"); + // 公共计算部分 calcWayBillCommonInfo(emisWaybillSave,null,true); @@ -2523,6 +2524,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb private void addNewWaybillByOms(EmisWaybill emisWaybillSave) throws EmisBizError { + // 设定为客户下单 + emisWaybillSave.setOrderType("0"); + // 公共计算部分 calcWayBillCommonInfoByOms(emisWaybillSave,true);