From 032d2559a9191ed57cc7ee582106521b937906d8 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 28 May 2024 10:36:55 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisElectronicPagApplyController.java | 10 ++++++++++ .../com/xdadan/erp/emis/service/EmisBaseService.java | 3 +++ .../service/impl/EmisElectronicPagServiceImpl.java | 1 - 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java index 13e91f29a..a19293d7b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java @@ -184,6 +184,16 @@ public class EmisElectronicPagApplyController extends BaseController @RequestMapping("/cancelApply") public AjaxResult cancelApply(@RequestBody EmisElectronicPagApply emisElectronicPagApply) { + + EmisElectronicPagApply old = emisElectronicPagApplyService.selectEmisElectronicPagApplyById(emisElectronicPagApply.getId()); + if("1".equals(old.getBlCancel())){ + return AjaxResult.error("申请单已取消，不允许再次操作！"); + } + + if("1".equals(old.getBlSend())){ + return AjaxResult.error("申请单已发放，不能取消！"); + } + emisElectronicPagApply.setCancelDate(new Date()); emisElectronicPagApply.setCancelManCode(getLoginUser().getUser().getEmpCode()); emisElectronicPagApply.setCancelSiteCode(getLoginUser().getUser().getOwnerSiteCode()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index b6714c559..42fd9bd5a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -392,8 +392,11 @@ public class EmisBaseService { String mainBillCode=waybill.getBillCode(); String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6); + String shortLogisticNo4Number=mainBillCode.substring(mainBillCode.length() - 4); // 短号,运单号后6位 order.put("shortLogisticNo", shortLogisticNo); + // 短号,运单号后4位 + order.put("shortLogisticNo4Number", shortLogisticNo4Number); String dispatchType="派送"; if("2".equals(waybill.getDispatchMethod())){ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java index e281a654f..e14de326f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java @@ -89,7 +89,6 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm if("1".equals(emisElectronicPagApply.getBlSend()) ){ throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"已发放，不能重复发放"); - } if("1".equals(emisElectronicPagApply.getBlCancel())