From c9064a39975c92fe20649067f1c14b36a853a4df Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 6 Jun 2023 20:04:51 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=8E=B7=E5=8F=96mdm=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=9B=B4=E6=96=B0=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=BA=93=EF=BC=8C=E4=B8=8D=E6=9B=B4=E6=96=B0=E7=A8=8E?= =?UTF-8?q?=E6=94=B6=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/service/impl/SDEnregyServiceImpl.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index ffb9c6fb..735b314a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -18,6 +18,7 @@ import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.thirdservice.user.dto.AddUserRequestDto; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; +import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.modules.taxcodematch.dao.SdenergyTaxCodeMatchDao; @@ -341,18 +342,14 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { List commodityCodeEntities = commodityMapper.queryByCommoditySpbmCompany(reqBO.getCODE()); List collect = commodityCodeEntities.stream().filter(t -> "-1".equals(t.getXhfNsrsbh())).collect(Collectors.toList()); String ggxh = StringUtils.isNotBlank(reqBO.getDESCSHORT())&& reqBO.getDESCSHORT().contains("_")? reqBO.getDESCSHORT().substring(reqBO.getDESCSHORT().indexOf("_") + 1) : ""; - if(GbkUtil.getGbkLength(ggxh) > ConfigureConstant.INT_40){ - try { - ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40); - } catch (IOException e) { - } - } + ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(ggxh); + //调整后不更新公司物料 if(collect != null && collect.size() > 0){ - matchCommodityCode(commodityCodeEntity); + //matchCommodityCode(commodityCodeEntity); commodityCodeEntity.setXmmc(reqBO.getDESC1()); commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码 commodityCodeEntity.setXmdw(reqBO.getDESC5()); - commodityCodeEntity.setCreateTime(new Date()); + commodityCodeEntity.setModifyTime(new Date()); commodityCodeEntity.setBz(reqBO.getDESCSHORT()); commodityCodeEntity.setGgxh(ggxh); commodityCodeEntity.setUUID(reqBO.getUUID()); @@ -362,7 +359,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { } commodityCodeEntity.setDataSource("4"); //matchCommodityCode(commodityCodeEntity); - List ids = commodityCodeEntities.stream().map(t -> t.getId()).collect(Collectors.toList()); + List ids = collect.stream().map(t -> t.getId()).collect(Collectors.toList()); int updateCommodity = commodityMapper.batchUpdateCommodity(commodityCodeEntity, ids); if (updateCommodity > 0) { commodityCodeEntity.setSuccess(true);