From 5cc921b273afd460d846b4851b533590ab6f2483 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Thu, 17 Sep 2026 16:46:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(supplier):=20=E6=B7=BB=E5=8A=A0=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99MOQ=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增getSupplierPartMoq方法用于精确查询单个供应商物料的MOQ与在用状态 - 实现复制功能时将源物料的MOQ全量信息复制到目标物料 - 添加SQL映射配置支持精确查询供应商物料MOQ信息 - 在价格复制的同时同步复制MOQ信息确保数据一致性 - 增加异常处理确保源物料MOQ信息存在性校验 --- .../mapper/SupplierPartMoqPriceMapper.java | 7 +++++++ .../impl/SupplierPartMoqPriceServiceImpl.java | 8 ++++++++ .../supplier/SupplierPartMoqPriceMapper.xml | 16 ++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/com/xujie/modules/supplier/mapper/SupplierPartMoqPriceMapper.java b/src/main/java/com/xujie/modules/supplier/mapper/SupplierPartMoqPriceMapper.java index 137f95a..fa31022 100644 --- a/src/main/java/com/xujie/modules/supplier/mapper/SupplierPartMoqPriceMapper.java +++ b/src/main/java/com/xujie/modules/supplier/mapper/SupplierPartMoqPriceMapper.java @@ -59,6 +59,13 @@ public interface SupplierPartMoqPriceMapper { List listSeriesPartByBasePartNo(@Param("site") String site, @Param("basePartNo") String basePartNo); + /** + * 精确查询单个供应商物料的MOQ与在用状态(复制时读取源物料用)。 + */ + SupplierPartMoqPriceVo getSupplierPartMoq(@Param("site") String site, + @Param("supplierCode") String supplierCode, + @Param("partNo") String partNo); + /** * 维护三个起订量。moq=QTY/PO,moqColor=MOQ/COLOR,qtyCarton=QTY/CARTON。 * site / supplierCode / partNo 必须与现有关系匹配。 diff --git a/src/main/java/com/xujie/modules/supplier/service/impl/SupplierPartMoqPriceServiceImpl.java b/src/main/java/com/xujie/modules/supplier/service/impl/SupplierPartMoqPriceServiceImpl.java index 37d6226..68543be 100644 --- a/src/main/java/com/xujie/modules/supplier/service/impl/SupplierPartMoqPriceServiceImpl.java +++ b/src/main/java/com/xujie/modules/supplier/service/impl/SupplierPartMoqPriceServiceImpl.java @@ -301,6 +301,11 @@ public class SupplierPartMoqPriceServiceImpl implements ISupplierPartMoqPriceSer String copyPriceDate = resolveCopyPriceDate(currentTierRows); String attachmentRefs = resolveCopyAttachmentRefs(currentTierRows); String submitBy = resolveSubmitBy(data.getSubmitBy()); + // 复制语义扩展:MOQ 全量信息(三个数量+在用状态)随价格一起复制到目标物料 + SupplierPartMoqPriceVo sourceMoq = supplierPartMoqPriceMapper.getSupplierPartMoq(site, supplierCode, sourcePartNo); + if (sourceMoq == null) { + throw new RuntimeException("源物料MOQ信息不存在"); + } List seriesRows = supplierPartMoqPriceMapper.listSeriesPartByBasePartNo(site, basePartNo); Set seriesPartNoSet = new LinkedHashSet<>(); @@ -341,6 +346,9 @@ public class SupplierPartMoqPriceServiceImpl implements ISupplierPartMoqPriceSer saveVo.setTierPriceList(cloneTierPriceItems(currentTierRows)); // 复用“变更价格表”逻辑:先写历史,再替换当前 - rqrq saveTierPrice(saveVo); + // MOQ 全量信息覆盖到目标物料,与价格同事务回滚 + supplierPartMoqPriceMapper.updateSupplierPartMoq(site, supplierCode, targetPartNo, + sourceMoq.getMoq(), sourceMoq.getMoqColor(), sourceMoq.getQtyCarton(), sourceMoq.getActive()); } } diff --git a/src/main/resources/mapper/supplier/SupplierPartMoqPriceMapper.xml b/src/main/resources/mapper/supplier/SupplierPartMoqPriceMapper.xml index b406ffd..b6998b5 100644 --- a/src/main/resources/mapper/supplier/SupplierPartMoqPriceMapper.xml +++ b/src/main/resources/mapper/supplier/SupplierPartMoqPriceMapper.xml @@ -214,6 +214,22 @@ AND p.part_no = #{partNo} + + + UPDATE SupplierforPart