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 71b034b3..83e77da9 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 @@ -414,14 +414,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()) @@ -436,8 +436,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); }