From 65ce1e0711a8fb9e24946872a53033d980b661be Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 15 Nov 2023 14:11:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 3 +++ .../DeliverRecordMainServiceImpl.java | 21 +++++++++++-------- 2 files changed, 15 insertions(+), 9 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 30d9d195..46705946 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 @@ -428,6 +428,7 @@ public interface ErrorCodeConstants { //采购收货任务子ErrorCode ErrorCode PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_074_000, "采购收货记录主不存在"); ErrorCode PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_074_001, "采购收货记录子不存在"); + ErrorCode PURCHASERECEIPT_RECORD_DETAIL_EXCEPTION = new ErrorCode(1_000_074_002, "采购收货记录明细问题【{}】"); //采购退货申请主ErrorCode ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在"); //采购退货申请子ErrorCode @@ -682,6 +683,8 @@ public interface ErrorCodeConstants { //发货记录ErrorCode ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_121_000, "发货记录主不存在"); ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_121_001, "发货记录子不存在"); + ErrorCode DELIVER_RECORD_DETAIL_EXCEPTION = new ErrorCode(1_000_121_002, "发货记录问题:【{}】"); + ErrorCode DELIVER_ORDER_DETAIL_EXCEPTION = new ErrorCode(1_000_121_003, "发货订单问题:【{}】"); //客户收货申请ErrorCode ErrorCode CUSTOMERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "客户收货申请主不存在"); ErrorCode CUSTOMERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "客户收货申请主不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index b8759838..1630dcaf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -81,46 +81,49 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { public DeliverRecordDetailDO selectDeliverRecordExist(String pnumber,String pitemCode,String psoNumber,String psoLine){ QueryWrapper queryWrapperMain = new QueryWrapper(); queryWrapperMain.eq("number",pnumber); + queryWrapperMain.eq("available","TRUE"); DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainMapper.selectOne(queryWrapperMain); - if(deliverRecordMainDO != null && "TRUE".equals(deliverRecordMainDO)){ + if(deliverRecordMainDO != null){ QueryWrapper queryWrapperDetail = new QueryWrapper(); queryWrapperDetail.eq("itemcode",pitemCode); queryWrapperDetail.eq("so_number",psoNumber); queryWrapperDetail.eq("so_line",psoLine); + queryWrapperDetail.eq("available","TRUE"); DeliverRecordDetailDO deliverRecordDetailDO = deliverRecordDetailMapper.selectOne(queryWrapperDetail); - if(deliverRecordDetailDO != null && "TRUE".equals(deliverRecordDetailDO.getAvailable())){ + if(deliverRecordDetailDO != null){ return deliverRecordDetailDO; }else { - throw new UtilException( "采购收货记录明细:销售订单号" + psoNumber + "、销售订单行、" + psoLine + "、物品代码" + pitemCode + "无效"); + throw exception(PURCHASERECEIPT_RECORD_DETAIL_EXCEPTION, "销售订单号" + psoNumber + "、销售订单行、" + psoLine + "、物品代码" + pitemCode + "无效"); } }else { - throw new UtilException( "发货订单无效" + pnumber + "无效"); - + throw exception(DELIVER_ORDER_DETAIL_EXCEPTION, "发货订单" + pnumber + "无效"); } } @Override public DeliverRecordMainDO selectsMainRecordExist(String pnumber){ QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("number",pnumber); + queryWrapper.eq("available","TRUE"); DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainMapper.selectOne(queryWrapper); - if(deliverRecordMainDO != null && "TRUE".equals(deliverRecordMainDO.getAvailable())){ + if(deliverRecordMainDO != null){ return deliverRecordMainDO; } else{ - throw new UtilException( "发货记录无效"+pnumber+"无效"); + throw exception(DELIVER_RECORD_DETAIL_EXCEPTION,"单据号" + pnumber + "无效"); } } @Override public List selectsDeliverRecordExist(String pnumber) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.in("number",pnumber); + queryWrapper.eq("available","TRUE"); List deliverRecordDetailDO = deliverRecordDetailMapper.selectList(queryWrapper); if(!deliverRecordDetailDO.isEmpty()) { for (DeliverRecordDetailDO detail : deliverRecordDetailDO) { - if (detail != null && "TRUE".equals(detail.getAvailable())) { + if (detail != null) { return deliverRecordDetailDO; } else { - throw new UtilException("发货记录明细：单据号" + pnumber + "无效"); + throw exception(DELIVER_RECORD_DETAIL_EXCEPTION,"单据号" + pnumber + "无效"); } } }