From 4d4e4e876052278111c4a58427ee1c92a626be82 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 22 Oct 2024 09:05:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=86=85=E7=BD=91=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E5=A4=96=E7=BD=91=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 2550dfc79..33d58bb43 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -179,45 +179,47 @@ public class IoCodeTempController extends BaseController { if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) { collectOrder = collectOrderService.unionSearch(null, null, code); //=============================================// - if (collectOrder == null) { - BaseResponse response = ResultVOUtils.error(501, "查无此单据号,先选择要处理的单据"); - response.setData(code); + if (collectOrder != null) { + collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); + collectOrder.setBusType(addEnterCodeRequest.getBusType()); + IoCollectOrder ioCollectOrder = new IoCollectOrder(); + BeanUtils.copyProperties(collectOrder, ioCollectOrder); + collectOrderService.updateById(ioCollectOrder); + + BaseResponse response = ResultVOUtils.error(601, code); + response.setData(collectOrder); return response; - } - collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); - collectOrder.setBusType(addEnterCodeRequest.getBusType()); - IoCollectOrder ioCollectOrder = new IoCollectOrder(); - BeanUtils.copyProperties(collectOrder, ioCollectOrder); - collectOrderService.updateById(ioCollectOrder); - - BaseResponse response = ResultVOUtils.error(601, code); - response.setData(collectOrder); - return response; - } else { - BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); - if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) { - collectOrder = collectOrderService.unionSearch(null, null, code); - //=============================================// - if (collectOrder != null) { - collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); - collectOrder.setBusType(addEnterCodeRequest.getBusType()); - IoCollectOrder ioCollectOrder = new IoCollectOrder(); - BeanUtils.copyProperties(collectOrder, ioCollectOrder); - collectOrderService.updateById(ioCollectOrder); - BaseResponse response = ResultVOUtils.error(601, code); - response.setData(collectOrder); - return response; + } else { + BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); + if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) { + collectOrder = collectOrderService.unionSearch(null, null, code); + //=============================================// + if (collectOrder != null) { + collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); + collectOrder.setBusType(addEnterCodeRequest.getBusType()); + IoCollectOrder ioCollectOrder = new IoCollectOrder(); + BeanUtils.copyProperties(collectOrder, ioCollectOrder); + collectOrderService.updateById(ioCollectOrder); + BaseResponse response = ResultVOUtils.error(601, code); + response.setData(collectOrder); + return response; + } } } - BaseResponse response = ResultVOUtils.error(501, baseResponse.getMessage()); + BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据"); response.setData(code); return response; } - } else { + + }else { BaseResponse response = ResultVOUtils.error(601, code); response.setData(collectOrder); return response; } + + BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据"); + response.setData(collectOrder); + return response; } //前端扫码完整性校验