From 3a1766428e2aa8a7418be31035d9b8ec780aecc2 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Wed, 16 Sep 2026 16:57:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(part):=20=E6=B7=BB=E5=8A=A0SKU=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BF=AE=E5=A4=8D=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在PartServiceImpl中注入SrmPartSkuMapper依赖 - 添加SKU存在性校验逻辑,确保传入的SKU在part_sku表中已维护 - 修复PurQuotationReplyHistServiceImpl中的价格验证条件,允许价格等于0 - 优化代码结构,增强参数校验的完整性 --- .../xujie/modules/part/service/Impl/PartServiceImpl.java | 9 +++++++++ .../service/impl/PurQuotationReplyHistServiceImpl.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java b/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java index 8b28816..d49c2eb 100644 --- a/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java +++ b/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xujie.common.utils.PageUtils; import com.xujie.modules.base.dao.PropertiesMapper; +import com.xujie.modules.baseInformation.mapper.SrmPartSkuMapper; import com.xujie.modules.constants.FlowInstanceConstans; import com.xujie.modules.part.dao.PartMapper; import com.xujie.modules.part.entity.Part; @@ -51,6 +52,8 @@ public class PartServiceImpl extends ServiceImpl implements IP private ErfFlowInstanceService erfFlowInstanceService; @Autowired private PropertiesMapper propertiesMapper; + @Autowired + private SrmPartSkuMapper srmPartSkuMapper; @Value("${part.formal-approval.enabled:true}") private Boolean partFormalApprovalEnabled; @@ -66,6 +69,12 @@ public class PartServiceImpl extends ServiceImpl implements IP throw new RuntimeException("工厂不能为空(请前端传site)"); } + // 传了sku时校验site+sku在part_sku中是否已维护,未传sku则不校验 + String sku = StringUtils.trim(model.getSku()); + if (StringUtils.isNotBlank(sku) && srmPartSkuMapper.selectPartSkuByCode(sku, site) == null) { + throw new RuntimeException("当前SKU不存在,请先维护"); + } + // 新增时按“基准料号 + 后缀”规则自动生成料号 if (model.getId() == null) { if (StringUtils.isBlank(model.getPartNo())) { diff --git a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java index dc130be..637642c 100644 --- a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java +++ b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java @@ -69,7 +69,7 @@ public class PurQuotationReplyHistServiceImpl extends ServiceImpl tierPriceList = normalizeTierPriceList(model.getTierPriceList()); - if (model.getPrice() == null || model.getPrice() <= 0) { + if (model.getPrice() == null || model.getPrice() < 0) { throw new RuntimeException("未税单价必须大于0"); } if (model.getItemNo() == null) {