From 158f8eac5ac348566b527f5836b7d1f001d44472 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Wed, 20 May 2026 15:32:23 +0800 Subject: [PATCH] =?UTF-8?q?1445=20WMS=E7=B3=BB=E7=BB=9F=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=A0=81=E6=95=B0=E9=87=8F=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=92=8C=E5=87=BA=E5=BA=93=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/wms/admin/controller/NormalPGIController.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 162d22a9..9a03fb5e 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; @@ -274,6 +275,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()); @@ -292,6 +294,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()); @@ -1634,6 +1638,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()); @@ -1652,6 +1657,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());