From 53f11c9ed2408d1609cf09c66bd4f51f55fa6329 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 15 Jun 2023 10:43:33 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8=E5=90=8E?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= 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 e5fbb05e..3db0916f 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,15 +615,18 @@ public class CommodityServiceImpl implements CommodityService { CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery(); commodityCodeCheckQuery.setXmmc(xmmc); - String zxbm = StringUtils.isNotBlank(receiveSpxxReq.getZxbm()) ? receiveSpxxReq.getZxbm() : baseService.getGenerateShotKey(); - commodityCodeCheckQuery.setZxbm(zxbm); + if(StringUtils.isBlank(receiveSpxxReq.getZxbm())){ + receiveSpxxReq.setZxbm(baseService.getGenerateShotKey()); + } + + commodityCodeCheckQuery.setZxbm(receiveSpxxReq.getZxbm()); 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",zxbm); + map.put("zxbm",receiveSpxxReq.getZxbm()); map.put("entId",receiveSpxxReq.getEntId()); if(StringUtils.isBlank(receiveSpxxReq.getEntId())){