diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java index a472695..383df92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java @@ -215,5 +215,7 @@ public class BasProduct extends BaseEntity private Integer quantity; + private String updateId; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java index 4d15a89..1f707f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java @@ -3,8 +3,10 @@ package com.ruoyi.bas.BasProduct.service.impl; import java.util.Date; import java.util.List; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.ruoyi.common.utils.SecurityUtils; +import org.apache.commons.math3.stat.descriptive.summary.Product; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.bas.BasProduct.mapper.BasProductMapper; @@ -91,10 +93,15 @@ public class BasProductServiceImpl implements IBasProductService @Override public int updateBasProduct(BasProduct basProduct) { - BasProduct basProduct1 = basProductMapper.selectBasProductByProductId(basProduct.getProductId()); - if(basProduct1!=null){ - return 0; + BasProduct basProduct1 = new BasProduct(); + basProduct1.setProductId(basProduct.getProductId()); + basProduct1.setUpdateId(basProduct.getProductGuid()); + List basProducts = basProductMapper.selectBasProductList(basProduct1); + if (CollUtil.isNotEmpty(basProducts)){ + throw new RuntimeException("物料编号已存在"); } + + return basProductMapper.updateBasProduct(basProduct); } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml index 8c572db..820000c 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"