From 14f557bbedaa674d816b95877016a5337420a6a5 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 16 May 2023 16:20:54 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=87=8D=E5=A4=8D=E5=85=A5=E5=BA=93=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/service/impl/CommodityServiceImpl.java | 8 +++++--- 1 file changed, 5 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 a29213f3..a60d6341 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 @@ -108,8 +108,10 @@ public class CommodityServiceImpl implements CommodityService { //判断保存或者修改操作 String id = codeEntity.getId(); Map map = new HashMap<>(); - CommodityCodeEntity commodityCodeEntity = commodityMapper.queryCommodityById(id, "", shList); - if (ObjectUtil.isNotEmpty(commodityCodeEntity)) { + map.put("zxbm",codeEntity.getZxbm()); + map.put("entId",codeEntity.getEntId()); + List commodityCodeEntities = commodityMapper.queryProductList(map, null); + if (ObjectUtil.isNotEmpty(commodityCodeEntities)) { log.debug("修改操作 id = {}", id); if (StringUtils.isNotEmpty(codeEntity.getSpbm())) { //已匹配 @@ -120,7 +122,7 @@ public class CommodityServiceImpl implements CommodityService { // 记录修改记录 Long userId = userInfoService.getUser().getUserId(); - if(commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId) == -1){ + if(commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntities.get(0), codeEntity, userId) == -1){ R.error().put(OrderManagementConstant.DATA, "数据未进行修改,无需保存"); } if(commodityMapper.updateCommodity(codeEntity, shList) <= 0){