From 9b4e5d62f4744eb7b1c98b8fc4299b3c8e694f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 11 Oct 2025 18:06:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-776=20=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=93=8D=E4=BD=9C=E6=89=AB=E7=A0=81=E5=90=8E?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutPurchaseController.java | 16 ++++++------- .../com/nflg/wms/common/pojo/qo/QRCodeQO.java | 17 +------------- .../nflg/wms/common/pojo/qo/QRCodeQO1.java | 23 +++++++++++++++++++ .../wms/common/pojo/vo/ZWM3A05ItemVO.java | 20 ++++++++-------- 4 files changed, 42 insertions(+), 34 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO1.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index 1ed0de56..a28c3576 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -109,12 +109,12 @@ public class OutPurchaseController extends BaseController { item.setNum(BigDecimal.ZERO); if (CollectionUtil.isNotEmpty(it.getQrCodes())) { it.getQrCodes().forEach(qrCode -> { - MaterialQRCodeContentDTO dto = NoUtil.getMaterialQRCodeContent(qrCode); + MaterialQRCodeContentDTO dto = NoUtil.getMaterialQRCodeContent(qrCode.getContent()); VUtil.trueThrowBusinessError(!StrUtil.equals(dto.getMaterialNo(), it.getMatnr())) .throwMessage("物料" + it.getMatnr() + "与二维码不匹配"); VUtil.trueThrowBusinessError(!check(dto, it.getCharg(), it.getSernrs())) .throwMessage("物料" + it.getMatnr() + "包含不符合批次号和序列号的扫码记录"); - item.setNum(item.getNum().add(dto.getNum())); + item.setNum(item.getNum().add(qrCode.getNum())); records.add(new OutMaterialScanRecord() .setSource(6) .setSourceId(order.getId()) @@ -122,7 +122,7 @@ public class OutPurchaseController extends BaseController { .setTicketId(order.getId()) .setTicketItemId(item.getId()) .setMaterialNo(dto.getMaterialNo()) - .setContent(qrCode) + .setContent(qrCode.getContent()) .setBatchNo(dto.getBatchNo()) .setSerialNo(dto.getSerialNo()) .setUniqNo(dto.getUniqNo()) @@ -137,10 +137,10 @@ public class OutPurchaseController extends BaseController { ); }); } - VUtil.trueThrowBusinessError(it.getNum().compareTo(item.getTemng()) > 0) - .throwMessage("物料" + it.getMatnr() + "的扫码数量大于退货数量"); - VUtil.trueThrowBusinessError(item.getNum().compareTo(it.getNum()) != 0) - .throwMessage("物料" + it.getMatnr() + "的扫码数量不一致"); +// VUtil.trueThrowBusinessError(it.getNum().compareTo(item.getTemng()) > 0) +// .throwMessage("物料" + it.getMatnr() + "的扫码数量大于退货数量"); +// VUtil.trueThrowBusinessError(item.getNum().compareTo(it.getNum()) != 0) +// .throwMessage("物料" + it.getMatnr() + "的扫码数量不一致"); items.add(item); if (item.getNum().compareTo(BigDecimal.ZERO) > 0) { input1.add(new ZWM3A06Input1DTO() @@ -148,7 +148,7 @@ public class OutPurchaseController extends BaseController { .setRetpo(it.getRetpo()) .setMatnr(it.getMatnr()) .setMaktx(it.getMaktx()) - .setErfmg(it.getNum()) + .setErfmg(item.getNum()) .setMeins(it.getMeins()) .setCharg(it.getCharg()) .setWerks(it.getWerks()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO.java index 8246fd33..5ee84920 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO.java @@ -1,29 +1,14 @@ package com.nflg.wms.common.pojo.qo; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import java.math.BigDecimal; - @Data -public class QRCodeQO { +public class QRCodeQO extends QRCodeQO1 { /** * 项id */ @NotNull private Long itemId; - - /** - * 二维码内容 - */ - @NotBlank - private String content; - - /** - * 数量 - */ - @NotNull - private BigDecimal num; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO1.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO1.java new file mode 100644 index 00000000..30bbf331 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeQO1.java @@ -0,0 +1,23 @@ +package com.nflg.wms.common.pojo.qo; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class QRCodeQO1 { + + /** + * 二维码内容 + */ + @NotBlank + private String content; + + /** + * 数量 + */ + @NotNull + private BigDecimal num; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java index fc03597d..44a239c7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java @@ -1,13 +1,13 @@ package com.nflg.wms.common.pojo.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.nflg.wms.common.pojo.qo.QRCodeQO1; import jakarta.validation.constraints.NotNull; import lombok.Data; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import java.util.Optional; @Data @JsonIgnoreProperties(ignoreUnknown = true) @@ -89,17 +89,17 @@ public class ZWM3A05ItemVO { */ private String binNos; - /** - * 实际退货数量（扫码后计算） - */ - private BigDecimal num; - - public BigDecimal getNum() { - return Optional.ofNullable(num).orElse(BigDecimal.ZERO); - } +// /** +// * 实际退货数量（扫码后计算） +// */ +// private BigDecimal num; +// +// public BigDecimal getNum() { +// return Optional.ofNullable(num).orElse(BigDecimal.ZERO); +// } /** * 二维码列表 */ - private List qrCodes = new ArrayList<>(); + private List qrCodes = new ArrayList<>(); }