From fb95be43003a89cc16e8d57b78ed2b77bb1c8d4b Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Mon, 12 Oct 2026 16:48:25 +0800 Subject: [PATCH] =?UTF-8?q?```=20fix(order):=20=E8=A7=A3=E5=86=B3PO?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BC=96=E8=BE=91=E6=97=B6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 替换validateRequiredPriceAndQty方法为专用编辑校验方法 - 添加注释说明qty/aQty双null时的业务逻辑处理 - 新增validateRequiredPriceAndQtyForEdit方法实现编辑路径校验 - 实现数量字段回退到现有值的校验逻辑 - 避免仅修改订单号时因数量为空导致的校验错误 ``` --- .../service/Impl/PODetailServiceImpl.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java index 98222d3..7a73dba 100644 --- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java @@ -1619,7 +1619,9 @@ public class PODetailServiceImpl extends ServiceImpl i model.setAQty(qtyTargets[1]); validatePoDetailUpdate(model, existingDetail); - validateRequiredPriceAndQty(model, model.getOrderNo()); + // 编辑路径专用:qty/aQty 双 null代表本次不动数量列(resolveAQtyEditTargets 的语义), + // 需用 existing 的既有值兜底参与必填校验,避免“仅改 po_no”无端报 PO Qty 不能为空。 + validateRequiredPriceAndQtyForEdit(model, existingDetail, model.getOrderNo()); poFieldAuthSupport.validateWriteFields(writableFieldMap, model); applyCalculatedPoValue(model); @@ -2624,6 +2626,32 @@ public class PODetailServiceImpl extends ServiceImpl i } } + /** + * 编辑路径专用校验: + * resolveAQtyEditTargets 在“数量未变化”时会将 model.qty/aQty 回写 null, + * 作为 updatePoDetailForEdit XML 中 不更新该列的标记, + * 不能被严格校验误判为“未传数量”。因此 qty/aQty/price 均先取 model 当前值, + * null 时回退到 existingDetail 的既有值;仅当两边都为 null 才抛“不能为空”。 + */ + private void validateRequiredPriceAndQtyForEdit(PODetailVo vo, PODetail existing, String context) { + if (vo == null) { + throw new RuntimeException("参数不能为空"); + } + String prefix = StringUtils.hasText(context) ? context + ":" : ""; + Double effectivePrice = vo.getPrice() != null ? vo.getPrice() + : (existing == null ? null : existing.getPrice()); + Double effectiveQty = vo.getQty() != null ? vo.getQty() + : (existing == null ? null : existing.getQty()); + Double effectiveAQty = vo.getAQty() != null ? vo.getAQty() + : (existing == null ? null : existing.getAQty()); + if (effectivePrice == null) { + throw new RuntimeException(prefix + "Unit Price 不能为空"); + } + if (effectiveQty == null && effectiveAQty == null) { + throw new RuntimeException(prefix + "PO Qty 不能为空"); + } + } + private String calculatePoValue(Double price, Double qty) { if (price == null || qty == null) { return null;