diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java index 6544411e..12d52d31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java @@ -87,5 +87,5 @@ public interface BomService { * @param version * @return */ - public BomDO bomItemCodeAndVersionExist(String productItemCode, String version); + public List bomItemCodeAndVersionExist(String productItemCode, String version); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java index 676a728a..d2ae319c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java @@ -172,14 +172,14 @@ public class BomServiceImpl implements BomService { } @Override - public BomDO bomItemCodeAndVersionExist(String productItemCode, String version) { + public List bomItemCodeAndVersionExist(String productItemCode, String version) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("product_item_code",productItemCode); queryWrapper.eq("version",version); queryWrapper.eq("available","TRUE"); - BomDO bomDO = bomMapper.selectOne(queryWrapper); - if( bomDO != null){ - return bomDO; + List bomDOList = bomMapper.selectList(queryWrapper); + if( bomDOList != null && bomDOList.size() > 0){ + return bomDOList; }else { throw exception(BOM_ITEM_VERSION_QTY_EXISTS, "父物料" + productItemCode + "与bom版本" + version + "关系无效"); }