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 2025-07-09 08:16:12 +08:00
parent 361504a273
commit b99d0a8fa9
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -107,11 +107,6 @@ public class EmisSettleBillController extends BaseController
} }
/** /**
* 开票统计 * 开票统计
* @param emisSettleBill * @param emisSettleBill
@ -148,7 +143,6 @@ public class EmisSettleBillController extends BaseController
} }
} }
if(!StringUtils.isEmpty(emisSettleBill.getSettleBillNo())){ if(!StringUtils.isEmpty(emisSettleBill.getSettleBillNo())){
emisSettleBill.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettleBill.getSettleBillNo())); emisSettleBill.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettleBill.getSettleBillNo()));
String[] settleBillNoSortList = emisSettleBill.getSettleBillNo().split(","); String[] settleBillNoSortList = emisSettleBill.getSettleBillNo().split(",");
@ -157,8 +151,6 @@ public class EmisSettleBillController extends BaseController
} }
} }
List<EmisSettleBill> list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill); List<EmisSettleBill> list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill);
return getDataTable(list); return getDataTable(list);
} }

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

@ -1742,6 +1742,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
checkBillFee(emisWaybillSave); checkBillFee(emisWaybillSave);
// 接单:上门取件时根据接单取件员更改寄件网点，仓库收货不调整
// bug:1685
// 如果专属业务员不为空，则寄件网点使用业务员的网点
if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){
SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode());
if(empUser!=null) {
emisWaybillSave.setSendSiteCode(empUser.getOwnerSiteCode());
}
}
// 基础信息更新 // 基础信息更新
emisWaybillMapper.updateEmisWaybill(emisWaybillSave); emisWaybillMapper.updateEmisWaybill(emisWaybillSave);
@ -1757,7 +1767,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 绑定专属业务员 // 绑定专属业务员
String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode(); String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode();
if(StringUtils.isEmpty(bindEmpCode)){ if(StringUtils.isEmpty(bindEmpCode)){
bindEmpCode=emisWaybillSave.getOperateEmployeeCode(); bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode();
} }
String customerCode=emisWaybillSave.getCustomerCode(); String customerCode=emisWaybillSave.getCustomerCode();