From ac440cb8617777a4ddfd29f7a479e3725c76b48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 16 Jun 2026 18:03:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(delivery):=20=E4=BF=AE=E5=A4=8D=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=A1=AE=E8=AE=A4=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=92=8C=E9=9B=B6=E5=80=BC=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除scanCodes为空的收货参数项，避免后续处理异常 - 修复receiptNum字段的零值比较逻辑，使用compareTo方法替代equals方法 - 移除receiptNum字段的@NotNull注解以允许零值传递 --- .../com/nflg/wms/admin/controller/NormalPGIController.java | 3 ++- .../java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) 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 9a50bab3..e9d99a97 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 @@ -189,6 +189,7 @@ public class NormalPGIController extends BaseController { @ApiMark(moduleName = "送货单管理", apiName = "收货确认") public ApiResult takeDelivery(@Valid @RequestBody List request) { VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("收货参数为空"); + request.removeIf(it -> CollectionUtil.isEmpty(it.getScanCodes())); WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, request.get(0).getNoteNum()).one(); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在"); List sapSyncParamsDTOS = getSapSyncParamsDTOS(request, order); @@ -223,7 +224,7 @@ public class NormalPGIController extends BaseController { for (SrmMaterialReceiptQO item : request) { - if (item.getReceiptNum().equals(BigDecimal.ZERO)) + if (item.getReceiptNum().compareTo(BigDecimal.ZERO)==0) continue; // 处理二维码 List autoFindChildCodes = Lists.newArrayList(); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java index f284b99b..8ce2c09b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java @@ -49,7 +49,6 @@ public class SrmMaterialReceiptQO { /** * 实际收货数量 */ - @NotNull private BigDecimal receiptNum; /**