From a2f4c5f2ab7071c9fd6a1c3ba2d64c3111d0ea76 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 16 May 2023 19:15:08 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=88=99=E8=B7=B3=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/service/impl/CommodityServiceImpl.java | 9 ++++++--- 1 file changed, 6 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 0af607b1..67b09e3b 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,6 +111,9 @@ 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, "新增物料信息已存在，请检查"); + } if (ObjectUtil.isNotEmpty(commodityCodeEntities)) { log.debug("修改操作 id = {}", id); if (StringUtils.isNotEmpty(codeEntity.getSpbm())) { @@ -123,11 +126,11 @@ public class CommodityServiceImpl implements CommodityService { Long userId = userInfoService.getUser().getUserId(); if(commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntities.get(0), codeEntity, userId) == -1){ - R.error().put(OrderManagementConstant.DATA, "数据未进行修改,无需保存"); + return R.error().put(OrderManagementConstant.DATA, "数据未进行修改,无需保存"); } codeEntity.setXhfNsrsbh(null); if(commodityMapper.updateCommodity(codeEntity, null) <= 0){ - R.error().put(OrderManagementConstant.DATA, "更新物料信息失败，请联系管理员"); + return R.error().put(OrderManagementConstant.DATA, "更新物料信息失败，请联系管理员"); } } else { @@ -144,7 +147,7 @@ public class CommodityServiceImpl implements CommodityService { } if(commodityMapper.insertCommodity(codeEntity) <= 0){ - R.error().put(OrderManagementConstant.DATA, "新增物料信息失败，请联系管理员"); + return R.error().put(OrderManagementConstant.DATA, "新增物料信息失败，请联系管理员"); } }