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

demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-05-26 13:20:57 +08:00
parent 42d6cd077f
commit b9b65f0838
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -4058,15 +4058,16 @@ public class EmisBaseService {
* 检查月结客户首次签约日期，首次签约之前开的不允许修改 * 检查月结客户首次签约日期，首次签约之前开的不允许修改
* *
* @param emisWaybillOld * @param emisWaybillOld
* @param emisWaybillNew
* @throws EmisBizError * @throws EmisBizError
*/ */
protected void checkFirstSigningDay(EmisWaybill emisWaybillOld) throws EmisBizError { protected void checkFirstSigningDay(EmisWaybill emisWaybillOld, EmisWaybill emisWaybillNew) throws EmisBizError {
if (emisWaybillOld == null || emisWaybillOld.getOrderDate() == null || StringUtil.isBlank(emisWaybillOld.getCustNo())) { if (emisWaybillOld == null || emisWaybillOld.getOrderDate() == null || emisWaybillNew == null || StringUtil.isBlank(emisWaybillNew.getCustNo())) {
return; return;
} }
EmisCustomerUser emisCustomerUser = emisCustomerUserMapper EmisCustomerUser emisCustomerUser = emisCustomerUserMapper
.selectMonthCustomerByMonthlyPayCode(emisWaybillOld.getCustNo()); .selectMonthCustomerByMonthlyPayCode(emisWaybillNew.getCustNo());
if (emisCustomerUser == null || StringUtil.isBlank(emisCustomerUser.getFirstSigningDay())) { if (emisCustomerUser == null || StringUtil.isBlank(emisCustomerUser.getFirstSigningDay())) {
return; return;
} }

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -110,7 +110,10 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
} }
// 检查月结客户首次签约日期，首次签约之前开的不允许修改 // 检查月结客户首次签约日期，首次签约之前开的不允许修改
checkFirstSigningDay(emisWaybillOld); checkFirstSigningDay(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply));
// 检查月结/现金客户额度
checkUseQuotaCredit(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply));
// 插入数据 // 插入数据
emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply); emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply);
@ -131,6 +134,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
return 1; return 1;
} }
private EmisWaybill getEmisWaybillNewFromJson(EmisWaybillAjustApply emisWaybillAjustApply) {
JSONObject jsonObject = JSONObject.parseObject(emisWaybillAjustApply.getJsonData());
JSONObject newValueJObj=jsonObject.getJSONObject("newValue");
WaybillOrder waybillOrder=newValueJObj.toJavaObject(WaybillOrder.class);
EmisWaybill emisWaybillSave = waybillOrder.toDb();
return emisWaybillSave;
}
/** /**
* 修改运单调整申请 * 修改运单调整申请
* *