From f05d9ea3c86cf235f59e3aa7e784495554682f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 29 Nov 2023 11:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E4=B8=8Ebom=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=85=B3=E7=B3=BB=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/win/module/wms/service/bom/BomService.java | 2 +- .../com/win/module/wms/service/bom/BomServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 + "关系无效"); }