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-01-21 00:58:27 +08:00
parent 4de8ff6f4d
commit 73ce7f5324
2 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java
View File

@ -8,6 +8,7 @@ public enum WaybillOperLogType {
CUST_CREATE_ORDER("1","客户下单"), CUST_CREATE_ORDER("1","客户下单"),
SITE_GOT("2","开单"), SITE_GOT("2","开单"),
SITE_MODIFY("3","改单"), SITE_MODIFY("3","改单"),
SITE_DEPARTURE("4","发件"), SITE_DEPARTURE("4","发件"),
@ -15,6 +16,11 @@ public enum WaybillOperLogType {
SITE_SENT("6","派送"), SITE_SENT("6","派送"),
CUST_SIGNED("7","签收"), CUST_SIGNED("7","签收"),
SITE_CANCEL_ORDER("81","站点取消"),
CUST_MODIFY_ORDER("91","客户改单"),
CUST_CANCEL_ORDER("92","客户取消"),
OTHER("99","其他"), OTHER("99","其他"),

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

@ -1519,7 +1519,19 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
emisWaybill.setBillCode(emisWaybillOld.getBillCode()); emisWaybill.setBillCode(emisWaybillOld.getBillCode());
return emisWaybillMapper.cancelOrder(emisWaybill);
emisWaybillMapper.cancelOrder(emisWaybill);
// 运单日志记录
recordWaybillOperLog(
emisWaybill.getBillCode(),
WaybillOperLogType.SITE_CANCEL_ORDER,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"网点取消，原因:【"+emisWaybill.getOrderRemark()+"】网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
);
return 1;
} }
@ -1548,7 +1560,19 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybill.setBillCode(emisWaybillOld.getBillCode()); emisWaybill.setBillCode(emisWaybillOld.getBillCode());
return emisWaybillMapper.cancelOrder(emisWaybill); emisWaybillMapper.cancelOrder(emisWaybill);
// 运单日志记录
recordWaybillOperLog(
emisWaybill.getBillCode(),
WaybillOperLogType.CUST_CANCEL_ORDER,
emisWaybillOld.getCustomerName(),
null,
"客户取消，原因:【"+emisWaybill.getOrderRemark()+"】";
);
return 1;
} }
@ -1607,6 +1631,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 基础信息更新 // 基础信息更新
emisWaybillMapper.updateEmisWaybill(emisWaybillSave); emisWaybillMapper.updateEmisWaybill(emisWaybillSave);
// 运单日志记录
recordWaybillOperLog(
emisWaybillSave.getBillCode(),
WaybillOperLogType.SITE_GOT,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"网点接单,网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
);
// 绑定专属业务员 // 绑定专属业务员
String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode(); String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode();
if(StringUtils.isEmpty(bindEmpCode)){ if(StringUtils.isEmpty(bindEmpCode)){
@ -2982,7 +3016,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
WaybillOperLogType.SITE_GOT, WaybillOperLogType.SITE_GOT,
getCurrentUser().getEmpName(), getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(), getCurrentUser().getOwnerSiteName(),
"网点揽收开单,网点:【"+getCurrentUser().getOwnerSiteName()+"】,录入人:【"+getCurrentUser().getEmpName()+"】" "网点揽收开单,网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
); );
// 绑定专属业务员 // 绑定专属业务员
@ -3408,6 +3442,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 基础信息更新 // 基础信息更新
emisWaybillMapper.updateEmisWaybill(emisWaybillSave); emisWaybillMapper.updateEmisWaybill(emisWaybillSave);
// 运单日志记录
recordWaybillOperLog(
emisWaybillSave.getBillCode(),
WaybillOperLogType.SITE_MODIFY,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),
"运单修改,网点:【"+getCurrentUser().getOwnerSiteName()+"】,操作:【"+getCurrentUser().getEmpName()+"】"
);
// 记录修改的数据 // 记录修改的数据
// 绑定专属业务员 // 绑定专属业务员
@ -3488,6 +3531,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 基础信息更新 // 基础信息更新
emisWaybillMapper.updateEmisWaybill(emisWaybillSave); emisWaybillMapper.updateEmisWaybill(emisWaybillSave);
// 运单日志记录
recordWaybillOperLog(
emisWaybillSave.getBillCode(),
WaybillOperLogType.CUST_MODIFY_ORDER,
emisWaybillSave.getCustomerName(),
null,
"客户改单"
);
// 绑定专属业务员 // 绑定专属业务员
String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode(); String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode();
if(StringUtils.isEmpty(bindEmpCode)){ if(StringUtils.isEmpty(bindEmpCode)){