rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
曹鹏飞 2026-04-01 19:35:48 +08:00
parent 459d6766af 9dd7011ded
commit 1fc36d7284
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
View File

@ -414,14 +414,14 @@ public class QrCodeMasterController extends BaseController {
} }
/** /**
* 换空箱扫码接口 * 换箱扫码接口
* *
* @param request * @param request
* @return * @return
* @author * @author
* */ * */
@PostMapping("pda/changeScan") @PostMapping("pda/changeScan")
@ApiMark(moduleName = "空箱换箱扫码", apiName = "扫码获取新箱子扫码信息") @ApiMark(moduleName = "换箱扫码", apiName = "扫码换箱箱子扫码信息")
public ApiResult<QrCodeVO> changeScan(@Valid @RequestBody QRCodeSearchQO request) { public ApiResult<QrCodeVO> changeScan(@Valid @RequestBody QRCodeSearchQO request) {
WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery() WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
.eq(WmsQrCodeMaster::getBarcodeCode, request.getPackageCode()) .eq(WmsQrCodeMaster::getBarcodeCode, request.getPackageCode())
@ -436,8 +436,10 @@ public class QrCodeMasterController extends BaseController {
.eq(WmsQrCodeMaster::getParentBarcodeId, qrCodeMaster.getId()) .eq(WmsQrCodeMaster::getParentBarcodeId, qrCodeMaster.getId())
.in(WmsQrCodeMaster::getProcessStage, request.getProcessStage()) .in(WmsQrCodeMaster::getProcessStage, request.getProcessStage())
.list(); .list();
VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(qrCodeMasters)) BigDecimal quantity = qrCodeMasters.stream().map(WmsQrCodeMaster::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
.throwMessage("此箱[" + request.getPackageCode() + "]不为空箱"); qrCodeVO.setQuantity(quantity);
List<QrCodeVO> qrCodeVOS = Convert.toList(QrCodeVO.class, qrCodeMasters);
qrCodeVO.setChildrenCode(qrCodeVOS);
} }
return ApiResult.success(qrCodeVO); return ApiResult.success(qrCodeVO);
} }