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 1b72993ee..66f7f15a8 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -195,8 +195,6 @@ public class IoCodeTempController extends BaseController { //取药确认 if (addEnterCodeRequest.getSelectType() != null) { - //判断是都绑定灯组 - List orderLeds = sysOrderLedService.list(new LambdaQueryWrapper().isNull(SysOrderLed::getOrderId) .or() .eq(SysOrderLed::getOrderId, "") @@ -224,7 +222,6 @@ 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); @@ -3145,25 +3142,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()); @@ -3173,7 +3170,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<>(); @@ -3181,7 +3178,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); @@ -3190,10 +3187,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("正确"); @@ -3211,7 +3208,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); @@ -3220,4 +3217,5 @@ public class IoCodeTempController extends BaseController { } + } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index eb99e7414..c1894db8b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -123,10 +123,25 @@ public class IoSplitFifoInvService extends ServiceImpl sysWorkplacePutRels = sysWorkplacePutRelService.selectByWorkPutCode(orderEntity.getWorkPlaceCode());