From fd62a414f64675662216eb0f86e8e0d1304c23d2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 14 Jun 2023 09:21:25 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=97=A0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=90=8E=E5=AD=98=E5=82=A8=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=87=AA=E5=AE=9A=E4=B9=89=E7=94=9F=E6=88=90?= =?UTF-8?q?18=E4=BD=8D=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/service/impl/CommodityServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 ee318f71..d2689aaf 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 @@ -615,14 +615,15 @@ public class CommodityServiceImpl implements CommodityService { CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery(); commodityCodeCheckQuery.setXmmc(xmmc); - commodityCodeCheckQuery.setZxbm(receiveSpxxReq.getZxbm()); + String zxbm = StringUtils.isNotBlank(receiveSpxxReq.getZxbm()) ? receiveSpxxReq.getZxbm() : baseService.getGenerateShotKey(); + commodityCodeCheckQuery.setZxbm(zxbm); commodityCodeCheckQuery.setGgxh(receiveSpxxReq.getGgxh()); commodityCodeCheckQuery.setXmdw(receiveSpxxReq.getXmdw()); commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj()); commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl()); commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId()); Map map = new HashMap<>(); - map.put("zxbm", receiveSpxxReq.getZxbm()); + map.put("zxbm",zxbm); map.put("entId",receiveSpxxReq.getEntId()); log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map);