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 9a435e1e2..b3b05fa82 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 @@ -1802,10 +1802,28 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setRegisterDate(new Date()); } + // 修正寄件网点 if(isNew) { - emisWaybillSave.setDataFrom(WaybillHelper.getDataFrom()); + // 如果专属业务员不为空,则寄件网点使用业务员的网点 + if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){ + SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode()); + if(empUser!=null) { + emisWaybillSave.setSendSiteCode(empUser.getOwnerSiteCode()); + } + } + + if(!StringUtils.isEmpty(emisWaybillSave.getOperateEmployeeCode()) && "1".equals(emisWaybillSave.getPickupMethod()) ){ + SysUser empUser = getEmisStaffByCode(emisWaybillSave.getOperateEmployeeCode()); + if(empUser!=null) { + emisWaybillSave.setSendSiteCode(empUser.getOwnerSiteCode()); + } + } } +// if(isNew) { +// emisWaybillSave.setDataFrom(WaybillHelper.getDataFrom()); +// } + // 寄件网点财务中心 if(isNew) {