From 12d36d43e969899c1e2cf5fa2ce30f3e30f0524f Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 14 Jun 2023 14:39:23 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=BA=93=E5=8A=9F=E8=83=BD=E5=85=AC=E5=8F=B8=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=BA=93=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index ad0437b7..8e43648e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1897,7 +1897,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(ending.size() > 0){ commodityCodeEntities = commodityMapper.queryCommodityByencodings(ending, Arrays.asList(param.getEntId()), Arrays.asList(param.getXhfNsrsbh())); } - Map collect = null; + Map collect = new HashMap<>(); if(commodityCodeEntities != null && commodityCodeEntities.size() > 0){ collect = commodityCodeEntities.stream().collect(Collectors.toMap(t -> t.getZxbm(), t -> t)); } @@ -1912,7 +1912,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { int i = 0; //公司不维护 CommodityCodeEntity commodityCodeOld = collect.get(itemInfo.getZxbm()); - if(collect == null || commodityCodeOld == null){ + if(commodityCodeOld == null){ commodityCodeEntity.setId(baseService.getGenerateShotKey()); commodityCodeEntity.setCreateTime(new Date()); commodityCodeEntity.setUserId(userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():"sync"); @@ -1934,6 +1934,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { } } catch (Exception e) { + log.error("更新公司库物料异常{}",e); sb.append(itemInfo.getSphxh()).append(","); } }