From 8ccb8554726b9ada79ffc8ed393b8980be68f9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 18 Nov 2023 17:34:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A5=E9=94=80=E8=AE=A2?= =?UTF-8?q?=E8=B4=AD=E7=9A=84=E5=8D=95=E6=8D=AE=E5=8F=8D=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/constants/ExceptionConstants.java | 6 ++++++ .../jsh/erp/service/depotHead/DepotHeadService.java | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 15378c14..b16908b2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -415,6 +415,12 @@ public class ExceptionConstants { //单据录入-单据附件不能超过规定数量 public static final int DEPOT_HEAD_FILE_NUM_LIMIT_CODE = 8500025; public static final String DEPOT_HEAD_FILE_NUM_LIMIT_MSG = "抱歉,单据附件不能超过%s份"; + //单据录入-完成采购的单据不能进行反审核 + public static final int DEPOT_HEAD_PURCHASE_STATUS_TWO_CODE = 8500026; + public static final String DEPOT_HEAD_PURCHASE_STATUS_TWO_MSG = "抱歉,完成采购的单据不能进行反审核"; + //单据录入-部分采购的单据不能进行反审核 + public static final int DEPOT_HEAD_PURCHASE_STATUS_THREE_CODE = 8500027; + public static final String DEPOT_HEAD_PURCHASE_STATUS_THREE_MSG = "抱歉,部分采购的单据不能进行反审核"; /** * 单据明细信息 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index d1e535a0..2494f83f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -582,13 +582,21 @@ public class DepotHeadService { for(Long id: ids) { DepotHead depotHead = getDepotHead(id); if("0".equals(status)){ - if("1".equals(depotHead.getStatus())) { + //进行反审核操作 + if("1".equals(depotHead.getStatus()) && "0".equals(depotHead.getPurchaseStatus())) { dhIds.add(id); + } else if("2".equals(depotHead.getPurchaseStatus())) { + throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_PURCHASE_STATUS_TWO_CODE, + String.format(ExceptionConstants.DEPOT_HEAD_PURCHASE_STATUS_TWO_MSG)); + } else if("3".equals(depotHead.getPurchaseStatus())) { + throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_PURCHASE_STATUS_THREE_CODE, + String.format(ExceptionConstants.DEPOT_HEAD_PURCHASE_STATUS_THREE_MSG)); } else { throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_AUDIT_TO_UN_AUDIT_FAILED_CODE, String.format(ExceptionConstants.DEPOT_HEAD_AUDIT_TO_UN_AUDIT_FAILED_MSG)); } } else if("1".equals(status)){ + //进行审核操作 if("0".equals(depotHead.getStatus())) { dhIds.add(id); } else {