From 9dd7011ded58cb466667996112701c960c09cf46 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Wed, 1 Apr 2026 19:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8D=A2=E7=AE=B1pda?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/QrCodeMasterController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java index 41475637..2fff26f2 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java @@ -416,14 +416,14 @@ public class QrCodeMasterController extends BaseController { } /** - * 换空箱扫码接口 + * 换箱扫码接口 * * @param request * @return * @author * */ @PostMapping("pda/changeScan") - @ApiMark(moduleName = "空箱换箱扫码", apiName = "扫码获取新箱子扫码信息") + @ApiMark(moduleName = "换箱扫码", apiName = "扫码换箱箱子扫码信息") public ApiResult changeScan(@Valid @RequestBody QRCodeSearchQO request) { WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getBarcodeCode, request.getPackageCode()) @@ -438,8 +438,10 @@ public class QrCodeMasterController extends BaseController { .eq(WmsQrCodeMaster::getParentBarcodeId, qrCodeMaster.getId()) .in(WmsQrCodeMaster::getProcessStage, request.getProcessStage()) .list(); - VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(qrCodeMasters)) - .throwMessage("此箱[" + request.getPackageCode() + "]不为空箱"); + BigDecimal quantity = qrCodeMasters.stream().map(WmsQrCodeMaster::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add); + qrCodeVO.setQuantity(quantity); + List qrCodeVOS = Convert.toList(QrCodeVO.class, qrCodeMasters); + qrCodeVO.setChildrenCode(qrCodeVOS); } return ApiResult.success(qrCodeVO); }