From fac8d1c6f76c6ffecd05c95bb67ff0e8ca371a25 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 15:17:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature=EF=BC=9Amdm=20=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=AC=AC=E4=B8=80=E4=B8=AA=E4=B8=8B=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E5=88=87=E5=89=B2=E5=8F=96=E5=85=B6=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/CommodityMapper.xml | 5 +++-- .../openapi/service/impl/SDEnregyServiceImpl.java | 10 +++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml index bb9b19cb..231ea25b 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml @@ -406,8 +406,9 @@ wlflmc = #{commodityCode.wlflmc,jdbcType=VARCHAR}, - - + + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, + commodity_id = #{commodityCode.commodityId,jdbcType=VARCHAR}, 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 a2973f0c..b974788c 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 @@ -213,12 +213,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { return AjaxResult.success("success", respStr); } - public static void main(String[] args) { - DecimalFormat g=new DecimalFormat("0000000000"); - - String code = String.format("%10s","60121A").replace(" ","0"); - System.out.println(); - } private static void structureBuyerEntity(BuyerEntity buyerEntity,MdmGmfxxtbReqBO tempMdmGmfxxtbReqBO){ buyerEntity.setTaxpayerCode(tempMdmGmfxxtbReqBO.getDESC14()); @@ -323,6 +317,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { reqBO.setCODE(code); 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(collect != null && collect.size() > 0){ matchCommodityCode(commodityCodeEntity); commodityCodeEntity.setXmmc(reqBO.getDESC1()); @@ -330,6 +325,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { commodityCodeEntity.setXmdw(reqBO.getDESC5()); commodityCodeEntity.setCreateTime(new Date()); commodityCodeEntity.setBz(reqBO.getDESCSHORT()); + commodityCodeEntity.setGgxh(ggxh); commodityCodeEntity.setUUID(reqBO.getUUID()); commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE()); if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){ @@ -356,6 +352,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { commodityCodeEntity.setCreateTime(new Date()); commodityCodeEntity.setBz(reqBO.getDESCSHORT()); commodityCodeEntity.setUUID(reqBO.getUUID()); + commodityCodeEntity.setGgxh(ggxh); commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE()); if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){ commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME()); @@ -387,7 +384,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { } return list; } - /** * 根据规则进行物料匹配 * From fbfc0184f8aef90f2209ec51ffedf7afafc32418 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 15:59:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9Amdm=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E5=88=87?= =?UTF-8?q?=E5=89=B240=E4=B8=AA=E5=AD=97=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/service/impl/SDEnregyServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 b974788c..c6d7f70e 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 @@ -15,6 +15,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.constant.ConfigureConstant; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.modules.taxcodematch.dao.SdenergyTaxCodeMatchDao; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; @@ -22,7 +23,9 @@ import com.dxhy.order.consumer.openapi.protocol.AjaxResult; import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.*; import com.dxhy.order.model.R; import com.dxhy.order.utils.DistributedKeyMaker; +import com.dxhy.order.utils.GbkUtil; import com.dxhy.order.utils.JsonUtils; +import com.dxhy.order.utils.StringUtil; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -34,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.io.IOException; import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -318,6 +322,12 @@ 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) { + } + } if(collect != null && collect.size() > 0){ matchCommodityCode(commodityCodeEntity); commodityCodeEntity.setXmmc(reqBO.getDESC1());