diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 6224ffa0..c5d513ef 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -7,6 +7,7 @@ package com.nflg.wms.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; @@ -282,6 +283,7 @@ public class NormalPGIController extends BaseController { .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); VUtil.trueThrowBusinessError(BigDecimal.ZERO.equals(code.getCodeNum())).throwMessage("数量不能为0"); + VUtil.trueThrowBusinessError(qrCodeMaster.getQuantity().compareTo(code.getCodeNum()) < 0).throwMessage("二维码【" + code.getCodeId() + "】,数量最大为:" + NumberUtil.toStr(qrCodeMaster.getQuantity())); qrCodeMaster.setLastScanTime(LocalDateTime.now()); qrCodeMaster.setLastScanBy(UserUtil.getUserId()); @@ -300,6 +302,8 @@ public class NormalPGIController extends BaseController { .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); VUtil.trueThrowBusinessError(BigDecimal.ZERO.equals(code.getCodeNum())).throwMessage("数量不能为0"); + VUtil.trueThrowBusinessError(qrCodeMaster.getQuantity().compareTo(code.getCodeNum()) < 0).throwMessage("二维码【" + code.getCodeId() + "】,数量最大为:" + NumberUtil.toStr(qrCodeMaster.getQuantity())); + qrCodeMaster.setLastScanTime(LocalDateTime.now()); qrCodeMaster.setLastScanBy(UserUtil.getUserId()); qrCodeMaster.setLastScanByname(UserUtil.getUserName()); @@ -1671,6 +1675,7 @@ public class NormalPGIController extends BaseController { .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); VUtil.trueThrowBusinessError(BigDecimal.ZERO.equals(code.getCodeNum())).throwMessage("数量不能为0"); + VUtil.trueThrowBusinessError(qrCodeMaster.getQuantity().compareTo(code.getCodeNum()) < 0).throwMessage("二维码【" + code.getCodeId() + "】,数量最大为:" + NumberUtil.toStr(qrCodeMaster.getQuantity())); qrCodeMaster.setLastScanTime(LocalDateTime.now()); qrCodeMaster.setLastScanBy(UserUtil.getUserId()); @@ -1689,6 +1694,7 @@ public class NormalPGIController extends BaseController { .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); VUtil.trueThrowBusinessError(BigDecimal.ZERO.equals(code.getCodeNum())).throwMessage("数量不能为0"); + VUtil.trueThrowBusinessError(qrCodeMaster.getQuantity().compareTo(code.getCodeNum()) < 0).throwMessage("二维码【" + code.getCodeId() + "】,数量最大为:" + NumberUtil.toStr(qrCodeMaster.getQuantity())); qrCodeMaster.setLastScanTime(LocalDateTime.now()); qrCodeMaster.setLastScanBy(UserUtil.getUserId());