From 6e5abf35dda9aeeac7fd0a4bdde2d8371e9d3202 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 25 Dec 2023 17:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=E5=92=8C=E9=A9=B3=E5=9B=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 36 ++++++++++--------- .../CountadjustRequestMainController.java | 15 ++++++-- .../CountRequestMainServiceImpl.java | 2 +- .../CountadjustRequestMainService.java | 10 +++++- .../CountadjustRequestMainServiceImpl.java | 29 +++++++++++---- .../CustomerreturnRequestMainServiceImpl.java | 2 +- .../CustomersettleRequestMainServiceImpl.java | 2 +- .../DeliverRequestMainServiceImpl.java | 2 +- .../InspectRequestMainServiceImpl.java | 2 +- ...InventorychangeRequestMainServiceImpl.java | 2 +- .../InventoryinitRequestMainServiceImpl.java | 2 +- .../InventorymoveRequestMainServiceImpl.java | 2 +- ...PurchasereceiptRequestMainServiceImpl.java | 2 +- .../PurchasereturnRequestMainServiceImpl.java | 2 +- .../PutawayRequestMainServiceImpl.java | 2 +- .../ScrapRequestMainServiceImpl.java | 2 +- .../TransferissueRequestMainServiceImpl.java | 2 +- ...TransferreceiptRequestMainServiceImpl.java | 2 +- .../UnplannedissueRequestMainServiceImpl.java | 2 +- ...nplannedreceiptRequestMainServiceImpl.java | 2 +- 20 files changed, 78 insertions(+), 44 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 431fb9b6..804613a6 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -439,7 +439,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_073_006, "采购收货状态不支持提交"); ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_073_007, "采购收货状态不支持审批同意"); ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_073_008, "采购收货状态不支持处理"); - ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_073_009, "采购收货状态不支持审批拒绝"); + ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_073_009, "采购收货状态不支持审批拒绝"); ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_073_010, "采购收货状态不支持重新添加"); //采购收货任务子ErrorCode ErrorCode PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_074_000, "采购收货记录主不存在"); @@ -457,7 +457,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERETURN_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_075_006, "采购退货状态不支持提交"); ErrorCode PURCHASERETURN_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_075_007, "采购退货状态不支持审批同意"); ErrorCode PURCHASERETURN_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_075_008, "采购退货状态不支持处理"); - ErrorCode PURCHASERETURN_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_075_009, "采购退货状态不支持审批拒绝"); + ErrorCode PURCHASERETURN_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_075_009, "采购退货状态不支持审批拒绝"); ErrorCode PURCHASERETURN_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_075_010, "采购退货状态不支持重新添加"); //采购退货任务主ErrorCode ErrorCode PURCHASERETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_076_000, "采购退货任务主不存在"); @@ -478,7 +478,7 @@ public interface ErrorCodeConstants { ErrorCode INSPECT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_078_005, "到货检验申请状态不支持提交"); ErrorCode INSPECT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "到货检验申请状态不支持审批同意"); ErrorCode INSPECT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "到货检验申请状态不支持处理"); - ErrorCode INSPECT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "到货检验申请状态不支持审批拒绝"); + ErrorCode INSPECT_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_078_008, "到货检验申请状态不支持审批拒绝"); ErrorCode INSPECT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_073_010, "到货检验状态不支持重新添加"); //检验任务主ErrorCode ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在"); @@ -499,7 +499,7 @@ public interface ErrorCodeConstants { ErrorCode PUTAWAY_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_081_005, "到货检验申请状态不支持提交"); ErrorCode PUTAWAY_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_081_006, "到货检验申请状态不支持审批同意"); ErrorCode PUTAWAY_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_081_007, "到货检验申请状态不支持处理"); - ErrorCode PUTAWAY_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_081_008, "到货检验申请状态不支持审批拒绝"); + ErrorCode PUTAWAY_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_081_008, "到货检验申请状态不支持审批拒绝"); //上架任务主ErrorCode ErrorCode PUTAWAY_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_082_000, "上架任务主不存在"); ErrorCode PUTAWAY_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_082_001, "上架任务状态错误"); @@ -787,7 +787,7 @@ public interface ErrorCodeConstants { ErrorCode DELIVER_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_119_004, "发货申请状态不支持提交"); ErrorCode DELIVER_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_119_005, "发货申请状态不支持审批同意"); ErrorCode DELIVER_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_119_006, "发货申请状态不支持处理"); - ErrorCode DELIVER_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_119_007, "发货申请状态不支持审批拒绝"); + ErrorCode DELIVER_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_119_007, "发货申请状态不支持审批拒绝"); ErrorCode DELIVER_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_119_007, "发货申请状态不支持重新添加"); //发货任务ErrorCode @@ -821,7 +821,7 @@ public interface ErrorCodeConstants { ErrorCode CUSTOMERRETURN_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_124_006, "客户退货状态不支持提交"); ErrorCode CUSTOMERRETURN_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_124_007, "客户退货状态不支持审批同意"); ErrorCode CUSTOMERRETURN_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_124_008, "客户退货状态不支持处理"); - ErrorCode CUSTOMERRETURN_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_124_009, "客户退货状态不支持审批拒绝"); + ErrorCode CUSTOMERRETURN_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_124_009, "客户退货状态不支持审批拒绝"); //客户退货任务ErrorCode ErrorCode CUSTOMERRETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_125_000, "客户退货任务主不存在"); @@ -837,7 +837,7 @@ public interface ErrorCodeConstants { ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_127_003, "客户结算申请状态不支持提交"); ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_127_004, "客户结算申请状态不支持审批同意"); ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_127_005, "客户结算申请状态不支持处理"); - ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_127_006, "客户结算申请状态不支持审批拒绝"); + ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_127_006, "客户结算申请状态不支持审批拒绝"); ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_127_007, "客户结算申请状态不支持重新添加"); ErrorCode CUSTOMERSETTLE_REQUEST_NOT_EXISTS = new ErrorCode(1_000_127_001, "客户结算申请不存在"); @@ -857,7 +857,7 @@ public interface ErrorCodeConstants { ErrorCode INVENTORYINIT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_129_005, "库存初始化状态不支持审批同意"); ErrorCode INVENTORYINIT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_129_006, "库存初始化状态不支持处理"); - ErrorCode INVENTORYINIT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_073_009, "库存初始化状态不支持审批拒绝"); + ErrorCode INVENTORYINIT_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_073_009, "库存初始化状态不支持审批拒绝"); //库存初始化记录ErrorCode ErrorCode INVENTORYINIT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_130_000, "库存初始化记录主不存在"); ErrorCode INVENTORYINIT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_130_001, "库存初始化记录子不存在"); @@ -869,7 +869,7 @@ public interface ErrorCodeConstants { ErrorCode INVENTORYMOVE_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_131_004, "库存转移申请状态不支持提交"); ErrorCode INVENTORYMOVE_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_131_005, "库存转移申请状态不支持审批同意"); ErrorCode INVENTORYMOVE_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_131_006, "库存转移申请状态不支持处理"); - ErrorCode INVENTORYMOVE_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_131_007, "库存转移申请状态不支持审批拒绝"); + ErrorCode INVENTORYMOVE_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_131_007, "库存转移申请状态不支持审批拒绝"); ErrorCode INVENTORYMOVE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_131_008, "库存转移申请状态不支持重新添加"); //库存转移任务ErrorCode ErrorCode INVENTORYMOVE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_132_000, "库存转移任务主不存在"); @@ -886,7 +886,7 @@ public interface ErrorCodeConstants { ErrorCode INVENTORYCHANGE_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_134_004, "库存修改申请状态不支持提交"); ErrorCode INVENTORYCHANGE_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_134_005, "库存修改申请状态不支持审批同意"); ErrorCode INVENTORYCHANGE_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_134_006, "库存修改申请状态不支持处理"); - ErrorCode INVENTORYCHANGE_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_134_007, "库存修改申请状态不支持审批拒绝"); + ErrorCode INVENTORYCHANGE_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_134_007, "库存修改申请状态不支持审批拒绝"); ErrorCode INVENTORYCHANGE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_134_008, "库存修改申请状态不支持重新添加"); //库存修改记录ErrorCode ErrorCode INVENTORYCHANGE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_135_000, "库存修改记录主不存在"); @@ -900,7 +900,7 @@ public interface ErrorCodeConstants { ErrorCode TRANSFERISSUE_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_136_004, "调拨出库申请状态不支持关闭"); ErrorCode TRANSFERISSUE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_136_005, "调拨出库申请状态不支持关闭"); ErrorCode TRANSFERISSUE_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_136_006, "调拨出库申请状态不支持提交"); - ErrorCode TRANSFERISSUE_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_136_007, "调拨出库申请状态不支持审批拒绝"); + ErrorCode TRANSFERISSUE_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_136_007, "调拨出库申请状态不支持审批拒绝"); ErrorCode TRANSFERISSUE_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_136_008, "调拨出库申请状态不支持审批同意"); ErrorCode TRANSFERISSUE_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_073_009, "调拨出库申请状态不支持处理"); @@ -922,7 +922,7 @@ public interface ErrorCodeConstants { ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_140_004, "调拨入库申请状态不支持关闭"); ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_140_005, "调拨入库申请状态不支持关闭"); ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_140_006, "调拨入库申请状态不支持提交"); - ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_140_007, "调拨入库申请状态不支持审批拒绝"); + ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_140_007, "调拨入库申请状态不支持审批拒绝"); ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_140_008, "调拨入库申请状态不支持审批同意"); ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_140_009, "调拨入库申请状态不支持处理"); @@ -943,7 +943,7 @@ public interface ErrorCodeConstants { ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_143_004, "计划外出库申请状态不支持关闭"); ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_143_005, "计划外出库申请状态不支持关闭"); ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_143_006, "计划外出库申请状态不支持提交"); - ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_143_007, "计划外出库申请状态不支持审批拒绝"); + ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_143_007, "计划外出库申请状态不支持审批拒绝"); ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_143_008, "计划外出库申请状态不支持审批同意"); ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_143_009, "计划外出库申请状态不支持处理"); @@ -964,7 +964,7 @@ public interface ErrorCodeConstants { ErrorCode UNPLANNEDRECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_146_003, "计划外入库申请状态不支持关闭"); ErrorCode UNPLANNEDRECEIPT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_146_004, "计划外入库申请状态不支持关闭"); ErrorCode UNPLANNEDRECEIPT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_146_005, "计划外入库申请状态不支持提交"); - ErrorCode UNPLANNEDRECEIPT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_146_006, "计划外入库申请状态不支持审批拒绝"); + ErrorCode UNPLANNEDRECEIPT_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_146_006, "计划外入库申请状态不支持审批拒绝"); ErrorCode UNPLANNEDRECEIPT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_146_007, "计划外入库申请状态不支持审批同意"); ErrorCode UNPLANNEDRECEIPT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_146_008, "计划外入库申请状态不支持处理"); ErrorCode UNPLANNEDRECEIPT_REQUEST_WAREHOSECODE_VALIDATE = new ErrorCode(1_000_146_009, "仓库【to_warehouse_code】与库位【to_location_code】关系错误"); @@ -988,7 +988,7 @@ public interface ErrorCodeConstants { ErrorCode SCRAP_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_149_005, "报废出库申请状态不支持关闭"); ErrorCode SCRAP_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_149_006, "报废出库申请状态不支持关闭"); ErrorCode SCRAP_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_149_007, "报废出库申请状态不支持提交"); - ErrorCode SCRAP_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_149_008, "报废出库申请状态不支持审批拒绝"); + ErrorCode SCRAP_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_149_008, "报废出库申请状态不支持审批拒绝"); ErrorCode SCRAP_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_149_009, "报废出库申请状态不支持审批同意"); ErrorCode SCRAP_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_149_010, "报废出库申请状态不支持处理"); @@ -1026,7 +1026,7 @@ public interface ErrorCodeConstants { ErrorCode COUNT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_073_006, "盘点状态不支持提交"); ErrorCode COUNT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_073_007, "盘点状态不支持审批同意"); ErrorCode COUNT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_073_008, "盘点状态不支持处理"); - ErrorCode COUNT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_073_009, "盘点状态不支持审批拒绝"); + ErrorCode COUNT_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_073_009, "盘点状态不支持审批拒绝"); ErrorCode COUNT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_073_010, "盘点状态不支持重新添加"); //盘点任务ErrorCode ErrorCode COUNT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_154_000, "盘点任务主不存在"); @@ -1042,10 +1042,12 @@ public interface ErrorCodeConstants { ErrorCode COUNTADJUST_REQUEST_THAW = new ErrorCode(1_000_156_001, "不能解冻"); ErrorCode COUNTADJUST_REQUEST_RECORD_EXISTS = new ErrorCode(1_000_078_003, "盘点调整申请存在盘点调整记录单"); ErrorCode COUNTADJUST_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_078_004, "盘点调整申请状态不支持关闭"); + ErrorCode COUNTADJUST_REQUEST_JOB_EXISTS = new ErrorCode(1_000_075_004, "盘点调整存在盘点调整任务单"); + ErrorCode COUNTADJUST_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_075_010, "盘点调整状态不支持重新添加"); ErrorCode COUNTADJUST_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_078_005, "盘点调整申请状态不支持提交"); ErrorCode COUNTADJUST_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "盘点调整申请状态不支持审批同意"); ErrorCode COUNTADJUST_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "盘点调整申请状态不支持处理"); - ErrorCode COUNTADJUST_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "盘点调整申请状态不支持审批拒绝"); + ErrorCode COUNTADJUST_REQUEST_CANNOT_REFUSED = new ErrorCode(1_000_078_008, "盘点调整申请状态不支持审批拒绝"); //盘点调整记录ErrorCode ErrorCode COUNTADJUST_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_157_000, "盘点调整记录主不存在"); ErrorCode COUNTADJUST_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_157_001, "盘点调整记录子不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java index 35f25cff..ee3dd4f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java @@ -128,6 +128,15 @@ public class CountadjustRequestMainController { return success(count > 0); } + @PutMapping("/reAdd") + @Operation(summary = "重新添加采购收货申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:reAdd')") + public CommonResult openCountadjustRequestMain(@RequestParam("id") Long id) { + Integer count = countadjustRequestMainService.reAddCountadjustRequestMain(id); + return success(count > 0); + } + @PutMapping("/submit") @Operation(summary = "提交盘点调整申请主") @Parameter(name = "id", description = "编号", required = true) @@ -155,12 +164,12 @@ public class CountadjustRequestMainController { return success(count > 0); } - @PutMapping("/abort") + @PutMapping("/refused") @Operation(summary = "审批拒绝盘点调整申请主") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:count-request-main:abort')") + @PreAuthorize("@ss.hasPermission('wms:count-request-main:refused')") public CommonResult abortCountadjustRequestMain(@RequestParam("id") Long id) { - Integer count = countadjustRequestMainService.abortCountadjustRequestMain(id); + Integer count = countadjustRequestMainService.refusedCountadjustRequestMain(id); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index f5e959e7..26c5896f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -340,7 +340,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(COUNT_REQUEST_CANNOT_ABORT); + throw new ServiceException(COUNT_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "countRequest", "审批拒绝了盘点申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java index 15504699..96cb042f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java @@ -54,6 +54,14 @@ public interface CountadjustRequestMainService { */ Integer closeCountadjustRequestMain(Long id); + /** + * 重新添加退货申请主 + * + * @param id 退货申请主ID + * @return 更新数量 + */ + Integer reAddCountadjustRequestMain(Long id); + /** * 提交盘点调整申请主 * @@ -82,6 +90,6 @@ public interface CountadjustRequestMainService { * @param id 盘点调整申请主ID * @return 更新数量 */ - Integer abortCountadjustRequestMain(Long id); + Integer refusedCountadjustRequestMain(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java index c38406cc..7da2ab27 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java @@ -106,7 +106,22 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_CLOSE); } mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 - trendsApi.createTrends(id, "countadjustRequest", "关闭了到货校验申请", TrendsTypeEnum.UPDATE); + trendsApi.createTrends(id, "countadjustRequest", "关闭了到盘点调整申请", TrendsTypeEnum.UPDATE); + return countadjustRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer reAddCountadjustRequestMain(Long id) { + // 校验存在存在下级单据 + CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.reAdd(); + if (!flag) { + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_RE_ADD); + } + mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 + trendsApi.createTrends(id, "countadjustRequest", "打开了盘点调整申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); } @@ -124,7 +139,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { this.generateRecord(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); } - trendsApi.createTrends(id, "countadjustRequest", "提交了到货校验申请", TrendsTypeEnum.UPDATE); + trendsApi.createTrends(id, "countadjustRequest", "提交了盘点调整申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); } @@ -143,7 +158,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { this.generateRecord(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); } - trendsApi.createTrends(id, "countadjustRequest", "审批同意了到货校验申请", TrendsTypeEnum.UPDATE); + trendsApi.createTrends(id, "countadjustRequest", "审批同意了盘点调整申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); } @@ -160,22 +175,22 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain mainDO.setStatus(requestStatusState.getState().getCode()); //调用执行方法 this.generateRecord(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); - trendsApi.createTrends(id, "countadjustRequest", "执行了到货校验申请", TrendsTypeEnum.UPDATE); + trendsApi.createTrends(id, "countadjustRequest", "执行了盘点调整申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); } @Override @Transactional - public Integer abortCountadjustRequestMain(Long id) { + public Integer refusedCountadjustRequestMain(Long id) { // 校验存在 CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_ABORT); + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); - trendsApi.createTrends(id, "countadjustRequest", "审批拒绝了到货校验申请", TrendsTypeEnum.UPDATE); + trendsApi.createTrends(id, "countadjustRequest", "审批拒绝了盘点调整申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 4c7eac5a..82a551ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -571,7 +571,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if (!flag) { - throw new ServiceException(CUSTOMERRETURN_REQUEST_CANNOT_ABORT); + throw new ServiceException(CUSTOMERRETURN_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "CustomerRejectRequest", "审批拒绝了客户退货申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java index e6a4c9f0..09383949 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java @@ -253,7 +253,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(CUSTOMERSETTLE_REQUEST_CANNOT_ABORT); + throw new ServiceException(CUSTOMERSETTLE_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "customersettleRequest", "审批拒绝了客户结算申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java index 849a2a5a..ddc09e3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java @@ -329,7 +329,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(DELIVER_REQUEST_CANNOT_ABORT); + throw new ServiceException(DELIVER_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "deliverRequest", "审批拒绝了发货申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index fdbd0521..79c5f420 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -364,7 +364,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(INSPECT_REQUEST_CANNOT_ABORT); + throw new ServiceException(INSPECT_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "inspectRequest", "审批拒绝了到货校验申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java index 982c97ff..d9175509 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java @@ -346,7 +346,7 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if (!flag) { - throw new ServiceException(INVENTORYCHANGE_REQUEST_CANNOT_ABORT); + throw new ServiceException(INVENTORYCHANGE_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "inventorychangeRequest", "审批拒绝了库存修改申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java index ef0bf52c..24d3be59 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java @@ -506,7 +506,7 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(INVENTORYINIT_REQUEST_CANNOT_ABORT); + throw new ServiceException(INVENTORYINIT_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "InventoryInitialRequest", "审批拒绝了库存初始化申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index 25d8d47b..8e9f9e7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -843,7 +843,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if (!flag) { - throw new ServiceException(INVENTORYMOVE_REQUEST_CANNOT_ABORT); + throw new ServiceException(INVENTORYMOVE_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, mainDO.getBusinessType(), "审批拒绝了库存转移申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index 794f2cef..d9ed5860 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -380,7 +380,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_ABORT); + throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "purchasereceiptRequest", "审批拒绝了采购收货申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 7e86db1a..ec09198b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -349,7 +349,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if (!flag) { - throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_ABORT); + throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "purchasereturnRequest", "审批拒绝了采购收货申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index 13e89dd3..345bf0dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -306,7 +306,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(PUTAWAY_REQUEST_CANNOT_ABORT); + throw new ServiceException(PUTAWAY_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "inspectRequest", "审批拒绝了到货校验申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java index eae238e5..a277f73f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java @@ -569,7 +569,7 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(SCRAP_REQUEST_CANNOT_ABORT); + throw new ServiceException(SCRAP_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "ScrapRequest", "审批拒绝了报废出库申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java index 7c10712c..fc8c86f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java @@ -533,7 +533,7 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(TRANSFERISSUE_REQUEST_CANNOT_ABORT); + throw new ServiceException(TRANSFERISSUE_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "transferissueRequest", "审批拒绝了调拨出库申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java index 39fff963..2e096861 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java @@ -462,7 +462,7 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(TRANSFERRECEIPT_REQUEST_CANNOT_ABORT); + throw new ServiceException(TRANSFERRECEIPT_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "TransferReceiptRequest", "审批拒绝了调拨入库申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index 797f74cf..185eb36c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java @@ -456,7 +456,7 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_CANNOT_ABORT); + throw new ServiceException(UNPLANNEDISSUE_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "UnplannedDeliverRequest", "审批拒绝了计划外出库申请", TrendsTypeEnum.UPDATE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java index 6d6b3964..db7bc6e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java @@ -496,7 +496,7 @@ public class UnplannedreceiptRequestMainServiceImpl implements UnplannedreceiptR RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(UNPLANNEDRECEIPT_REQUEST_CANNOT_ABORT); + throw new ServiceException(UNPLANNEDRECEIPT_REQUEST_CANNOT_REFUSED); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "UnplannedReceiptRequest", "审批拒绝了计划外入库申请", TrendsTypeEnum.UPDATE);