demand: TMS系统 - 网点费用申请 - 当申请人员工类型为单证员时,网点费用申请涉及费用发生变化时,审批通过之后需要产生弹窗提醒,.提醒对象:该运单的销售联系人以及其关联的销售人员
committer: heyu
This commit is contained in:
parent
ca94198d51
commit
68a271d733
@ -424,7 +424,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
|
|||||||
"/d24/expenseRecognitionManagemen/WaybillAjustApplyList");
|
"/d24/expenseRecognitionManagemen/WaybillAjustApplyList");
|
||||||
|
|
||||||
// 检查申请人是否为单证员且费用发生变化时,需要通知相关人员
|
// 检查申请人是否为单证员且费用发生变化时,需要通知相关人员
|
||||||
checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave, isDZZS);
|
checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave);
|
||||||
|
|
||||||
if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) {
|
if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) {
|
||||||
// 重新计算提成
|
// 重新计算提成
|
||||||
@ -531,11 +531,10 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
|
|||||||
* @param emisWaybillAjustApply 运单调整申请
|
* @param emisWaybillAjustApply 运单调整申请
|
||||||
* @param emisWaybillOld 原运单信息
|
* @param emisWaybillOld 原运单信息
|
||||||
* @param emisWaybillSave 新运单信息
|
* @param emisWaybillSave 新运单信息
|
||||||
* @param isDZZS
|
|
||||||
*/
|
*/
|
||||||
private void checkAndNotifyFeeChange(EmisWaybillAjustApply emisWaybillAjustApply,
|
private void checkAndNotifyFeeChange(EmisWaybillAjustApply emisWaybillAjustApply,
|
||||||
EmisWaybill emisWaybillOld,
|
EmisWaybill emisWaybillOld,
|
||||||
EmisWaybill emisWaybillSave, boolean isDZZS) {
|
EmisWaybill emisWaybillSave) {
|
||||||
try {
|
try {
|
||||||
// String message = "单证员已对运单费用进行调整,请关注相关变化";
|
// String message = "单证员已对运单费用进行调整,请关注相关变化";
|
||||||
String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList";
|
String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList";
|
||||||
@ -546,8 +545,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
|
|||||||
// 2. 检测网点费用申请是否涉及费用发生变化
|
// 2. 检测网点费用申请是否涉及费用发生变化
|
||||||
boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave);
|
boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave);
|
||||||
|
|
||||||
if (!isDZZS || !feeChanged) {
|
if (!feeChanged) {
|
||||||
return; // 不是单证员/费用没有变化,无需特殊处理
|
return; //费用没有变化,无需特殊处理
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean isDZZS = checkIsDZZS(emisWaybillAjustApply.getApplyManCode());
|
||||||
|
|
||||||
|
if (!isDZZS ) {
|
||||||
|
return; // 不是单证专属,无需特殊处理
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 获取运单对应的payee、salesmen信息
|
// 3. 获取运单对应的payee、salesmen信息
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user