From 3b2d2deac8ee0d07a2c8e684f808648b4ab3b1e5 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 16 May 2023 21:03:35 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/service/impl/CommodityServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index 3a74aba8..7a78412a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -111,10 +111,16 @@ public class CommodityServiceImpl implements CommodityService { map.put("zxbm",codeEntity.getZxbm()); map.put("entId",codeEntity.getEntId()); List commodityCodeEntities = commodityMapper.queryProductList(map, null); - if(StringUtils.isBlank(id) && ObjectUtil.isNotEmpty(commodityCodeEntities)){ - return R.error().put(OrderManagementConstant.DATA, "新增物料信息已存在，请检查"); + long count = 0; + if(commodityCodeEntities != null && commodityCodeEntities.size() > 0){ + count = commodityCodeEntities.stream().filter(t -> id.equals(t.getId())).count(); + //CommodityCodeEntity commodityCodeEntity = commodityMapper.queryCommodityById(id, "", shList); + if(count == 0){ + return R.error().put(OrderManagementConstant.DATA, "新增物料信息已存在，请检查"); + } } - if (StringUtils.isNotBlank(id) && ObjectUtil.isNotEmpty(commodityCodeEntities)) { + + if (count > 0 && ObjectUtil.isNotEmpty(commodityCodeEntities)) { log.debug("修改操作 id = {}", id); if (StringUtils.isNotEmpty(codeEntity.getSpbm())) { //已匹配