From 75d08e32b1f85c1c869a256912648cd8c6a9a2e8 Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Tue, 25 Nov 2025 15:25:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/contractorder/api/OrderApi.java | 1 + .../contractorder/api/dto/order/UpdateOrderLstQtyDTO.java | 6 +++--- .../zt/plat/module/contractorder/api/OrderApiImpl.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java index b4ef8c60..5255bf8e 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java @@ -6,6 +6,7 @@ import com.zt.plat.module.contractorder.api.dto.order.UpdateOrderLstQtyDTO; import com.zt.plat.module.contractorder.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/UpdateOrderLstQtyDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/UpdateOrderLstQtyDTO.java index 98be02e8..b09ff84d 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/UpdateOrderLstQtyDTO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/UpdateOrderLstQtyDTO.java @@ -15,9 +15,9 @@ public class UpdateOrderLstQtyDTO { /** * 主键 */ - @Schema(description = "主键") - @NotNull(message = "主键不能为空") - private Long id; + @Schema(description = "订单明细id") + @NotNull(message = "订单明细id不能为空") + private Long orderDetailId; /** * 已收货数量 */ diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index 1a89d11c..b9f858b7 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -102,21 +102,21 @@ public class OrderApiImpl implements OrderApi { PrchOrdDtlMapper prchOrdDtlMapper = SpringUtil.getBean(PrchOrdDtlMapper.class); updateOrderLstQtyDTOS.forEach(f -> { if ("SALE".equals(f.getSplyBsnTp())) { - SalesOrderDetailDO salesOrderDetailDO = salesOrderDetailMapper.selectById(f.getId()); + SalesOrderDetailDO salesOrderDetailDO = salesOrderDetailMapper.selectById(f.getOrderDetailId()); // 处理 trfQty 可能为 null 的情况,默认值 0 BigDecimal trfQty = Optional.ofNullable(salesOrderDetailDO.getTrfQty()) .orElse(BigDecimal.ZERO); SalesOrderDetailDO updateDO = new SalesOrderDetailDO(); - updateDO.setId(f.getId()); // 给更新对象设 ID + updateDO.setId(f.getOrderDetailId()); // 给更新对象设 ID updateDO.setTrfQty(trfQty.add(f.getLstQty())); // 累加(trfQty ) salesOrderDetailMapper.updateById(updateDO); } else if ("PUR".equals(f.getSplyBsnTp())) { // 采购 - PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(f.getId()); + PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(f.getOrderDetailId()); BigDecimal trfQty = Optional.ofNullable(prchOrdDtlDO.getTrfQty()) .orElse(BigDecimal.ZERO); PrchOrdDtlDO updateDO = new PrchOrdDtlDO(); - updateDO.setId(f.getId()); + updateDO.setId(f.getOrderDetailId()); updateDO.setTrfQty(trfQty.add(f.getLstQty())); prchOrdDtlMapper.updateById(updateDO); } else {