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

Merge pull request 'demand: 运单修改取件方式会导致寄件网点不准确bug修复' (#115) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/115
This commit is contained in:
heyu 2025-07-11 14:14:26 +08:00
commit b800e7f1c9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -208,7 +208,7 @@ public class EmisWaybill extends BaseEntity
@TableField @TableField
@DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method") @DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method")
private String dispatchMethod; private String dispatchMethod;
/* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */ /* 取件方式:1-仓库收货 2-上门取件 3-整柜提货 */
@TableField @TableField
@DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi") @DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi")
private String pickupMethod; private String pickupMethod;

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

@ -2071,6 +2071,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setPackType("2"); emisWaybillSave.setPackType("2");
} }
if ("1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod())) {
emisWaybillSave.setTakePieceEmployeeCode(null);
}
// 如果专属业务员不为空，则寄件网点使用业务员的网点 // 如果专属业务员不为空，则寄件网点使用业务员的网点
if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){ if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){
SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode()); SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode());