diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index 51da6a479..5eea38dc3 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -128,7 +128,7 @@ public class IoCollectCodeBackupController extends BaseController { @GetMapping("/udiwms/basic/collect/ioCollectCode/endList") public BaseResponse filterList(IoCollectCodeRequest request) { IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo()); - if(request.getSelectType() == null){ + if (request.getSelectType() == null) { //如果是null 正常查询 request.setSelectType(1); } @@ -212,31 +212,29 @@ public class IoCollectCodeBackupController extends BaseController { @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/deleteCodes") public BaseResponse deleteCodes(@RequestBody IoCollectCodeRequest request) { IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo()); - List list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo())); - if (list.size() > 0) { - ioCollectOrderCheckCodeService.removeBatchByIds(list); - } - List list1 = ioCollectCodeBackService.list(new LambdaQueryWrapper().eq(IoCollectCodeBackup::getBillNo, request.getBillNo())); - List filteredList = list1.stream() - .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 3) - .collect(Collectors.toList()); - if (filteredList.size() > 0) { - ioCollectCodeBackService.removeBatchByIds(filteredList); - } - List filteredList2 = list1.stream() - .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1) - .collect(Collectors.toList()); - if (filteredList2.size() > 0) { - filteredList2.forEach(item -> item.setScanCodeCheckStatus(0)); - // 调用服务层方法批量更新 - ioCollectCodeBackService.updateBatchById(filteredList2); - } - order.setCheckCodeConfirm(0); - ioCollectOrderBackupService.updateByBillNo(order); + List list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo())); + if (list.size() > 0) { + ioCollectOrderCheckCodeService.removeBatchByIds(list); + } + List list1 = ioCollectCodeBackService.list(new LambdaQueryWrapper().eq(IoCollectCodeBackup::getBillNo, request.getBillNo())); + List filteredList = list1.stream() + .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 3) + .collect(Collectors.toList()); + if (filteredList.size() > 0) { + ioCollectCodeBackService.removeBatchByIds(filteredList); + } + List filteredList2 = list1.stream() + .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1) + .collect(Collectors.toList()); + if (filteredList2.size() > 0) { + filteredList2.forEach(item -> item.setScanCodeCheckStatus(0)); + // 调用服务层方法批量更新 + ioCollectCodeBackService.updateBatchById(filteredList2); + } + order.setCheckCodeConfirm(0); + ioCollectOrderBackupService.updateByBillNo(order); return ResultVOUtils.success(); } - - } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 64c4c111e..66d4d12e4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -140,7 +140,7 @@ public class IoSplitCodeService extends ServiceImpl