From b9d1d81e4a5323c31203d66919850d7ec588c0c8 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 21 Feb 2025 12:04:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=8B=E5=8A=A8=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E6=8B=89=E5=8D=95=EF=BC=8C=E4=B8=8D=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 24 +++++++++---------- .../controller/inout/IoOrderController.java | 2 +- .../api/req/collect/CollectOrderRequest.java | 5 ++++ .../api/service/collect/DownloadFactory.java | 2 +- .../collect/IoCollectOrderService.java | 8 +++---- 5 files changed, 22 insertions(+), 19 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 eab9376c8..1b72993ee 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -224,6 +224,7 @@ public class IoCodeTempController extends BaseController { collectOrderRequest.setBusType(addEnterCodeRequest.getBusType()); collectOrderRequest.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); collectOrderRequest.setBillNo(code); + collectOrderRequest.setForceAllot(true); BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest); if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) { collectOrder = collectOrderService.unionSearch(null, null, code); @@ -3144,25 +3145,25 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/warehouse/inout/deleteCode") - public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest){ + public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest) { // 已经做过校验了 所以 要上药队列 还是库存队列 的码 然后进行扣减库存 删码 IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest); - if (ioCodeTemp != null){ + if (ioCodeTemp != null) { codeTempService.removeCodeById(ioCodeTemp); return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest)); } IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest); - if (ioSplitFifoCode != null){ + if (ioSplitFifoCode != null) { ArrayList codes = new ArrayList<>(); codes.add(ioSplitFifoCode.getCode()); - ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode()); + ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode()); return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest)); } //判断是上位队列 还是 库存 - return ResultVOUtils.error(500,"追溯码不存在"); + return ResultVOUtils.error(500, "追溯码不存在"); } - public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest){ + public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest) { UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode()); UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); udiEntity.setCode(filterCodeRequest.getCode()); @@ -3172,7 +3173,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/warehouse/inout/deleteCodes") - public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest){ + public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest) { List codeList = filterCodeRequest.getCodeList(); AddCodeResult addCodeResult = new AddCodeResult(); List vailCodeResultResponses = new ArrayList<>(); @@ -3180,7 +3181,7 @@ public class IoCodeTempController extends BaseController { VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); filterCodeRequest.setCode(code); IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest); - if (ioCodeTemp != null){ + if (ioCodeTemp != null) { codeTempService.removeCodeById(ioCodeTemp); vailCodeResultResponse.setCode(code); vailCodeResultResponse.setStatus(1); @@ -3189,10 +3190,10 @@ public class IoCodeTempController extends BaseController { continue; } IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest); - if (ioSplitFifoCode != null){ + if (ioSplitFifoCode != null) { ArrayList codes = new ArrayList<>(); codes.add(ioSplitFifoCode.getCode()); - ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode()); + ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode()); vailCodeResultResponse.setCode(code); vailCodeResultResponse.setStatus(1); vailCodeResultResponse.setErrMsg("正确"); @@ -3210,7 +3211,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/warehouse/inout/fallback") - public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest){ + public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest) { List codeList = codeTempService.selectListByGroupNumber(filterCodeRequest.getGroupNumber()); for (IoCodeTempEntity codeTempEntity : codeList) { codeTempService.removeCodeById(codeTempEntity); @@ -3219,5 +3220,4 @@ public class IoCodeTempController extends BaseController { } - } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 4b0247a58..182ef6c3c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1384,7 +1384,7 @@ public class IoOrderController extends BaseController { @GetMapping("/udiwms/inout/order/getProcessingOrder") public BaseResponse getProcessingOrder(AddOrderRequest addOrderRequest) { - IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "",addOrderRequest.getWorkPlaceQueueCode(), getUserId()); + IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "", addOrderRequest.getWorkPlaceQueueCode(), getUserId()); return ResultVOUtils.success(order); } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index b455d8b0d..94559c22f 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -159,5 +159,10 @@ public class CollectOrderRequest extends ListPageRequest { private List uploadStatusList; + /** + * 强制拉去单据转成待处理 + */ + private Boolean forceAllot; + } diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index 81362010e..3bfa07c3f 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -252,7 +252,7 @@ public class DownloadFactory { ioCollectOrder.setBizList(bizList); ioCollectOrderList.add(ioCollectOrder); } - collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest.getBusType()); + collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest ); return ResultVOUtils.success("下载成功"); } return ResultVOUtils.error("下载失败"); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 5b0296406..8cc94e17c 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -640,11 +640,10 @@ public class IoCollectOrderService extends ServiceImpl ioCollectOrderList, String addr) { - + public void importPrescribe(List ioCollectOrderList, CollectOrderRequest collectOrderRequest) { + String addr = collectOrderRequest.getBusType(); if (CollUtil.isNotEmpty(ioCollectOrderList)) { //是否自动转成待处理单据 @@ -689,7 +688,7 @@ public class IoCollectOrderService extends ServiceImpl