Browse Source

Merge remote-tracking branch 'origin/master'

master
常熟吴彦祖 2 months ago
parent
commit
38f225fecb
  1. 9
      src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java
  2. 2
      src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java

9
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xujie.common.utils.PageUtils; import com.xujie.common.utils.PageUtils;
import com.xujie.modules.base.dao.PropertiesMapper; import com.xujie.modules.base.dao.PropertiesMapper;
import com.xujie.modules.baseInformation.mapper.SrmPartSkuMapper;
import com.xujie.modules.constants.FlowInstanceConstans; import com.xujie.modules.constants.FlowInstanceConstans;
import com.xujie.modules.part.dao.PartMapper; import com.xujie.modules.part.dao.PartMapper;
import com.xujie.modules.part.entity.Part; import com.xujie.modules.part.entity.Part;
@ -51,6 +52,8 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements IP
private ErfFlowInstanceService erfFlowInstanceService; private ErfFlowInstanceService erfFlowInstanceService;
@Autowired @Autowired
private PropertiesMapper propertiesMapper; private PropertiesMapper propertiesMapper;
@Autowired
private SrmPartSkuMapper srmPartSkuMapper;
@Value("${part.formal-approval.enabled:true}") @Value("${part.formal-approval.enabled:true}")
private Boolean partFormalApprovalEnabled; private Boolean partFormalApprovalEnabled;
@ -66,6 +69,12 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements IP
throw new RuntimeException("工厂不能为空(请前端传site)"); 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 (model.getId() == null) {
if (StringUtils.isBlank(model.getPartNo())) { if (StringUtils.isBlank(model.getPartNo())) {

2
src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java

@ -69,7 +69,7 @@ public class PurQuotationReplyHistServiceImpl extends ServiceImpl<PurQuotationRe
String createBy = resolveCreateBy(model.getCreatedBy()); String createBy = resolveCreateBy(model.getCreatedBy());
List<PurQuotationTierPriceItemVo> tierPriceList = normalizeTierPriceList(model.getTierPriceList()); List<PurQuotationTierPriceItemVo> tierPriceList = normalizeTierPriceList(model.getTierPriceList());
if (model.getPrice() == null || model.getPrice() <= 0) {
if (model.getPrice() == null || model.getPrice() < 0) {
throw new RuntimeException("未税单价必须大于0"); throw new RuntimeException("未税单价必须大于0");
} }
if (model.getItemNo() == null) { if (model.getItemNo() == null) {

Loading…
Cancel
Save