From 348104658c1613111ae49511a735d77215df3a7a Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Tue, 13 Jun 2023 16:47:57 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feature=201.=E5=AF=B9=E6=8E=A5=E7=94=B5?= =?UTF-8?q?=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/constant/ConfigureConstant.java | 1 + .../dxhy/order/constant/OrderInfoEnum.java | 1 + .../service/impl/PushInvoiceServiceImpl.java | 2 ++ .../po/generateinvoice/sap/FpkjReqSap.java | 19 +++++++++++++++--- .../generateinvoicepush/sap/FpkjtsReqSap.java | 11 +++++++++- .../consumer/utils/BeanTransitionUtils.java | 20 +++++++++++++++++-- 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/ConfigureConstant.java b/order-management-common/src/main/java/com/dxhy/order/constant/ConfigureConstant.java index f39744c2..cee466f0 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/ConfigureConstant.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/ConfigureConstant.java @@ -29,6 +29,7 @@ public class ConfigureConstant { public static final String STRING_1_ = "-1"; public static final String STRING_0 = "0"; + public static final String STRING_X = "X"; public static final String STRING_000 = "0.00"; diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index ca98b7b9..0d577d6a 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -403,6 +403,7 @@ public enum OrderInfoEnum { * 系统来源(SAP:SAP) */ SYS_SOURCE_SAP("SAP","SAP"), + SYS_SOURCE_DSXT("DSXT","DSXT"), /** * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据） diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 51c8af61..8c1d6ead 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1344,6 +1344,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { fpkjtsReqSap.setZGSDM(orderProcessInfo.getGsdm()); fpkjtsReqSap.setZYWDJ(orderProcessInfo.getBzdh()); fpkjtsReqSap.setIMGID(orderInvoiceInfo.getDocuId()); + fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL()); + fpkjtsReqSap.setZJLLX(ddfpxx.getZJLLX()); //明细信息 ddmxxx.stream().forEach(f -> { FpkjtsMxSap detail = new FpkjtsMxSap(); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java index 3c75b87d..9e538400 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java @@ -1,6 +1,5 @@ package com.dxhy.order.consumer.openapi.protocol.po.generateinvoice.sap; -import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam; import lombok.Data; import java.util.List; @@ -88,6 +87,20 @@ public class FpkjReqSap { * 行项目结构 */ private List ITITEM; - - + //是否为电商系统数据 + private String ZDSXT; + //是否独立开票抬头 + private String ZDLKPTT; + //金税开票抬头名称 + private String ZKPTTMC; + //金税开票纳税人识别号 + private String ZKPSBH; + //金税开票地址 + private String ZKPDZ; + //金税开票电话 + private String ZKPDH; + //金税开票开户行 + private String ZKPKHH; + //金税开票银行账号 + private String ZKPZH; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java index ef0da2b6..6d03d3fb 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java @@ -1,7 +1,6 @@ package com.dxhy.order.consumer.openapi.protocol.po.generateinvoicepush.sap; import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.util.List; @@ -273,4 +272,14 @@ public class FpkjtsReqSap { */ @JSONField(name = "IT_ITEM") private List ITITEM; + + /** + * pdf流 + */ + private String PDFZJL; + + /** + * 字节流类型针对pdfzjl进行处理,OFD和PDF + */ + private String ZJLLX; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 55c4da32..095b9724 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -51,12 +51,14 @@ import com.dxhy.order.model.sk.hp.*; import com.dxhy.order.model.sk.kp.*; import com.dxhy.order.model.sk.query.ResponseCommonInvoice; import com.dxhy.order.model.sk.sld.SearchSld; -import com.dxhy.order.utils.*; +import com.dxhy.order.utils.CommonUtils; +import com.dxhy.order.utils.DecimalCalculateUtil; +import com.dxhy.order.utils.JsonUtils; +import com.dxhy.order.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import java.io.IOException; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -3504,6 +3506,20 @@ public class BeanTransitionUtils { ddtxxBO.setDDH(req.getZJSDH()); ddtxxBO.setBZDH(req.getZBZDH()); ddtxxBO.setXTLY(isinput.getSYSID()); + //如果为X,表示数据来自电商系统，开票完成后需要推送给电商系统开票数据及板式文件。 +// if(StringUtils.isNotBlank(req.getZDSXT()) && ConfigureConstant.STRING_X.equals(req.getZDSXT())){ +// ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()); +// } + //如果此字段为X，表示开票抬头数据不取购方ZGFBH关联的信息，而是取21-26列数据。 + if(StringUtils.isNotBlank(req.getZDLKPTT()) && ConfigureConstant.STRING_X.equals(req.getZDLKPTT())){ + ddtxxBO.setGMFMC(req.getZKPTTMC()); + ddtxxBO.setGMFSBH(req.getZKPSBH()); + ddtxxBO.setGMFDH(req.getZKPDH()); + ddtxxBO.setGMFDZ(req.getZKPDZ()); + ddtxxBO.setGMFYH(req.getZKPKHH()); + ddtxxBO.setGMFZH(req.getZKPZH()); + ddtxxBO.setGMFBM(""); + } ddtxxBO.setGSDM(req.getBUKRS()); ddtxxBO.setENTID(deptEntity.getDeptId()); ddtxxBO.setBHZT(ConfigureConstant.STRING_0); From 86c8b02bdfd88a97bf7b8a6c63eeb117bd78d7d5 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 13 Jun 2023 17:41:57 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feature=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E3=80=81=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E3=80=81=E5=8D=95=E4=BB=B7=E3=80=81=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/controller/CommodityController.java | 13 +++++++++++++ .../resources/mybatis/mapper/CommodityMapper.xml | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index 046a1881..c929864d 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -167,6 +167,19 @@ public class CommodityController { if(StringUtils.isBlank(commodityCodeEntity.getZxbm())||"000000000000000000".equals(commodityCodeEntity.getZxbm())){ commodityCodeEntity.setZxbm(commodityCodeEntity.getId()); } + if(StringUtils.isBlank(commodityCodeEntity.getGgxh())){ + commodityCodeEntity.setGgxh(""); + } + if(StringUtils.isBlank(commodityCodeEntity.getXmdw())){ + commodityCodeEntity.setXmdw(""); + } + if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){ + commodityCodeEntity.setXmdj(""); + } + if(StringUtils.isBlank(commodityCodeEntity.getInvoiceName())){ + commodityCodeEntity.setInvoiceName(""); + } + /** * 添加校验 */ 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 a38dacc6..318791fd 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 @@ -266,13 +266,13 @@ tax_rate = #{commodityCode.sl,jdbcType=VARCHAR}, - + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, - + metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR}, - + unit_price = #{commodityCode.xmdj,jdbcType=VARCHAR}, @@ -356,7 +356,7 @@ tswl = #{commodityCode.tswl,jdbcType=VARCHAR}, - + invoice_name = #{commodityCode.invoiceName,jdbcType=VARCHAR}, From 40226abaf8ab5bb0accaaf50577a9a39319e2460 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 13 Jun 2023 19:34:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E4=BC=98=E5=85=88=E7=BA=A7=E9=AB=98=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GroupCommodityCodeServiceImpl.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java index 72175910..018e2c7e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java @@ -4,7 +4,9 @@ import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; 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.service.UserInfoService; import com.dxhy.order.constant.ConfigureConstant; +import com.dxhy.order.constant.TaxClassCodeEnum; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO; import com.dxhy.order.consumer.modules.commodity.domain.dto.QuoteGroupCommodityDTO; @@ -28,6 +30,7 @@ import javax.annotation.Resource; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -54,6 +57,9 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService @Resource private TaxClassCodeMapper taxClassCodeMapper; + @Resource + private UserInfoService userInfoService; + /** * 查询集团物料库 * @@ -136,7 +142,15 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService log.error("{}引用物料异常", LOGGER_MSG, e); } if(queryCommodityEntity != null){ + //如果优先级更高则不进行更新 + if(Arrays.asList("1,2,6,7,8,10".split(",")).contains(queryCommodityEntity.getDataSource())){ + return R.error("第" + (i + 1) + "条数据，已存在"); + } newCommodityCodeEntity.setId(queryCommodityEntity.getId()); + newCommodityCodeEntity.setModifyTime(new Date()); + newCommodityCodeEntity.setCreateTime(null); + newCommodityCodeEntity.setUserId(null); + newCommodityCodeEntity.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():""); if (groupCommodityMapper.updateCommodityCode(newCommodityCodeEntity) <= 0) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return R.error("第" + (i + 1) + "条数据，引用失败"); @@ -144,10 +158,12 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService }else{ newCommodityCodeEntity.setId(baseService.getGenerateShotKey()); newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh()); - newCommodityCodeEntity.setDataState("0"); + newCommodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_SOURCE_9.getKey()); newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc()); - newCommodityCodeEntity.setHsbz("1"); - newCommodityCodeEntity.setYhzcbs("0"); + newCommodityCodeEntity.setHsbz(ConfigureConstant.STRING_1); + newCommodityCodeEntity.setYhzcbs(ConfigureConstant.STRING_0); + newCommodityCodeEntity.setCreateTime(new Date()); + newCommodityCodeEntity.setUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():""); if(StringUtils.isNotBlank(newCommodityCodeEntity.getSpbm())){ TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.queryTaxClassCodeEntityBySpbm(newCommodityCodeEntity.getSpbm()); if(taxClassCodeEntity != null){ From 507ce24ecdcd7b48098898a25e81a3bae2f13276 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 13 Jun 2023 19:57:15 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feature=EF=BC=9A=E9=9B=86=E5=9B=A2=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=BA=93=E5=8F=98=E6=9B=B4=E7=A8=8E=E7=BC=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/controller/CommodityController.java | 5 +++-- .../src/main/resources/mybatis/mapper/CommodityMapper.xml | 3 +++ .../service/impl/GroupCommodityCodeServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index c929864d..82f3b477 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -204,13 +204,14 @@ public class CommodityController { CommodityCodeEntity commodityCode = new CommodityCodeEntity(); commodityCode.setSpjc(spjc); commodityCode.setSpbm(spbm); + commodityCode.setModifyTime(new Date()); + commodityCode.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ?userInfoService.getUser().getUserId().toString():""); try { - commodityService.batchUpdateCommodity(commodityCode,ids); + return commodityService.batchUpdateCommodity(commodityCode,ids); } catch (Exception e) { log.error("更新集团物料失败，异常信息{}",e); return R.error("系统更新异常，请联系管理员"); } - return R.ok(); } /** * 删除 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 2349e334..1110f1c8 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 @@ -465,6 +465,9 @@ modify_time = #{commodityCode.modifyTime,jdbcType=TIMESTAMP}, + + modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR}, + description = #{commodityCode.bz,jdbcType=VARCHAR}, diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java index 018e2c7e..951c7ee1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java @@ -158,7 +158,8 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService }else{ newCommodityCodeEntity.setId(baseService.getGenerateShotKey()); newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh()); - newCommodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_SOURCE_9.getKey()); + newCommodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_9.getKey()); + newCommodityCodeEntity.setDataState(ConfigureConstant.STRING_0); newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc()); newCommodityCodeEntity.setHsbz(ConfigureConstant.STRING_1); newCommodityCodeEntity.setYhzcbs(ConfigureConstant.STRING_0); From da87c514a070307be2d7a0ae788615764e22d448 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 13 Jun 2023 20:18:07 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feature=EF=BC=9A=E7=A8=8E=E6=94=B6=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/mapper/CommodityMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 1110f1c8..d18dc27c 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 @@ -306,7 +306,7 @@ user_id = #{commodityCode.userId,jdbcType=VARCHAR}, - + create_time = #{commodityCode.createTime,jdbcType=TIMESTAMP}, @@ -459,10 +459,10 @@ metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR}, - + create_time = #{commodityCode.createTime,jdbcType=TIMESTAMP}, - + modify_time = #{commodityCode.modifyTime,jdbcType=TIMESTAMP}, From e821e7f15a665c2be563d91da8c3a0297d1eec27 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 13 Jun 2023 21:08:50 +0800 Subject: [PATCH 6/9] =?UTF-8?q?feature=EF=BC=9A=E5=85=8B=E9=9A=86=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=AE=BE=E7=BD=AE=E6=9D=A5=E6=BA=90=E3=80=81=E5=85=8B?= =?UTF-8?q?=E9=9A=86=E4=BA=BA=E3=80=81=E5=85=8B=E9=9A=86=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/CloneCompanyCommodityDetailDTO.java | 3 +++ .../service/impl/CompanyCommodityCodeServiceImpl.java | 9 +++++++++ .../mybatis/mapper/GroupCommodityCodeMapper.xml | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java index 30192ef1..74a7d0c9 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java @@ -17,4 +17,7 @@ public class CloneCompanyCommodityDetailDTO { private String entId; // 数据权限id @NotBlank(message = "销方名称") private String xhfMc; + + private String userId; + private String dataSource; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java index 1a1affd0..ecdbd29c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java @@ -1,6 +1,8 @@ package com.dxhy.order.consumer.modules.commodity.service.impl; import com.dxhy.order.baseservice.module.commodity.dao.GroupCommodityMapper; +import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; +import com.dxhy.order.constant.TaxClassCodeEnum; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDTO; import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDetailDTO; @@ -13,6 +15,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; +import javax.annotation.Resource; + /** * @Description * @Author 巩权林 @@ -23,6 +27,8 @@ public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeSer @Autowired private GroupCommodityCodeMapper groupCommodityMapper; + @Resource + private UserInfoService userInfoService; /** * 克隆物料 @@ -38,6 +44,9 @@ public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeSer ValidateUtils.validate(to); ValidateUtils.validate(from); + from.setUserId(userInfoService.getUser() != null&&userInfoService.getUser().getUserId()!= null?userInfoService.getUser().getUserId().toString():"clone"); + from.setDataSource(TaxClassCodeEnum.DATA_SOURCE_10.getKey()); + // 删除to公司下的所有物料 groupCommodityMapper.deleteCommodityCodeByXhfNsrsbh(to); diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml index eff72748..85a2eeed 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml @@ -569,13 +569,13 @@ tax_classification_name, preferential_policies_type, zzstsgl, - user_id, - create_time, + #{from.userId,jdbcType=VARCHAR}, + now(), modify_time, modify_user_id, group_id, #{to.xhfMc,jdbcType=VARCHAR}, - data_source, + #{from.dataSource,jdbcType=VARCHAR}, matching_state, data_state, tax_class_abbreviation, From 688914cb59b57ff557705773ae0b722e1205faa0 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 13 Jun 2023 22:01:04 +0800 Subject: [PATCH 7/9] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=9E=9A=E4=B8=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommodityController.java | 6 ++---- .../commodity/model/CommodityCodeEnum.java | 18 +++++++++++------ .../service/impl/CommodityServiceImpl.java | 20 +++++++++---------- .../impl/GroupTaxClassCodeServiceImpl.java | 7 ++++--- .../service/impl/VehiclesServiceImpl.java | 5 +++-- .../utils/BaseServiceBeanTransitionUtils.java | 3 ++- .../dxhy/order/constant/TaxClassCodeEnum.java | 5 ----- .../config/rabbitmq/OrderSaveSpxxHandler.java | 3 ++- .../impl/CompanyCommodityCodeServiceImpl.java | 5 ++--- .../impl/GroupCommodityCodeServiceImpl.java | 3 ++- .../service/impl/OrderInfoServiceImpl.java | 3 ++- .../service/impl/InterfaceServiceImplV3.java | 3 ++- .../consumer/utils/BeanTransitionUtils.java | 3 ++- .../mapper/GroupCommodityCodeMapper.xml | 4 ++-- 14 files changed, 47 insertions(+), 41 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index 82f3b477..afbd66d4 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -11,6 +11,7 @@ import com.dxhy.order.baseservice.annotation.SysLog; import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.commodity.constant.CommodityEnum; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.model.CommodityExcel; import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO; import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; @@ -176,9 +177,6 @@ public class CommodityController { if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){ commodityCodeEntity.setXmdj(""); } - if(StringUtils.isBlank(commodityCodeEntity.getInvoiceName())){ - commodityCodeEntity.setInvoiceName(""); - } /** * 添加校验 @@ -731,7 +729,7 @@ public class CommodityController { //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送 commodityExcel.setDataSource(""); if(StringUtils.isNotBlank(commodityCodeEntity.getDataSource())){ - TaxClassCodeEnum codeValue = TaxClassCodeEnum.getCodeValue(commodityCodeEntity.getDataSource()); + CommodityCodeEnum codeValue = CommodityCodeEnum.getCodeValue(commodityCodeEntity.getDataSource()); commodityExcel.setDataSource(codeValue.getValue()); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java index 69f90de3..c54f13ed 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java @@ -3,14 +3,20 @@ package com.dxhy.order.baseservice.module.commodity.model; /** * 不在使用，使用TaxClassCodeEnum里的枚举 */ -@SuppressWarnings("") public enum CommodityCodeEnum { //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送 - DATA_SOURCE_10("0", "集团共享"), - DATA_SOURCE_11("1", "手工创建"), - DATA_SOURCE_12("2", "模板导入"), - DATA_SOURCE_13("3", "采集下级"), - DATA_SOURCE_14("4", "MDM推送"), + DATA_SOURCE_0("0", "集团共享"),//放弃使用 + DATA_SOURCE_1("1", "手工创建"), + DATA_SOURCE_2("2", "模板导入"), + DATA_SOURCE_3("3", "采集下级"), + DATA_SOURCE_4("4", "自动归集"),//物料监听器机动车自动归集，入库OrderSaveSpxxHandler已被注释掉 + DATA_SOURCE_5("5", "接口同步"), + DATA_SOURCE_6("6", "手工填开"), + DATA_SOURCE_7("7", "历史数据"), + DATA_SOURCE_8("8", "订单同步公司库"), + DATA_SOURCE_9("9", "引用集团库"), + DATA_SOURCE_10("10", "克隆公司库"), + DATA_SOURCE_11("11", "电商接口同步"), ; 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 d89bbec8..ee318f71 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 @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.module.commodity.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.*; @@ -139,7 +140,7 @@ public class CommodityServiceImpl implements CommodityService { } } else { - codeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); + codeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey()); codeEntity.setCreateTime(new Date()); codeEntity.setUserId(userId.toString()); codeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); @@ -352,7 +353,7 @@ public class CommodityServiceImpl implements CommodityService { String tempMerchandiseName = StringUtil.replaceStr(commodityCodeEntity.getXmmc()); commodityCodeEntity.setXmmc(tempMerchandiseName); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_2.getKey()); commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); if (StringUtils.isNotEmpty(commodityCodeEntity.getSsflMc()) @@ -415,7 +416,7 @@ public class CommodityServiceImpl implements CommodityService { entity.setSpbm(taxClassCodeParam.getSsbm()); entity.setXhfNsrsbh(nsrsbh); entity.setSpjc(taxClassCodeParam.getSsjc()); - entity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_0.getKey());//接口已放弃不在使用 + entity.setDataSource(CommodityCodeEnum.DATA_SOURCE_0.getKey());//接口已放弃不在使用 entity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); entity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); entity.setUserId(userId); @@ -621,13 +622,11 @@ public class CommodityServiceImpl implements CommodityService { commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl()); commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId()); Map map = new HashMap<>(); -// map.put("productName", xmmc); map.put("zxbm", receiveSpxxReq.getZxbm()); map.put("entId",receiveSpxxReq.getEntId()); log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map); List commodityCodeEntityList = commodityMapper.queryProductList(map, null); - //R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false); TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); CommodityCodeEntity commodityCodeEntity = null; if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { @@ -640,12 +639,17 @@ public class CommodityServiceImpl implements CommodityService { * */ if (commodityCodeEntity != null){ + commodityCodeEntity.setUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():""); + commodityCodeEntity.setCreateTime(new Date()); commodityMapper.insertCommodity(commodityCodeEntity); log.debug("添加成功"); } }else{ // 简称、商品编码、规格型号、单位、优惠政策标识、零税率标识 + //todo 优先级 + commodityCodeEntity.setModifyTime(new Date()); + commodityCodeEntity.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():""); if (commodityCodeEntity != null){ commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); } @@ -721,10 +725,6 @@ public class CommodityServiceImpl implements CommodityService { commodityCodeEntity.setSsflMc(taxClassCodeEntity.getSpmc()); commodityCodeEntity.setLslbs(receiveSpxxReq.getLslbs()); commodityCodeEntity.setZzstsgl(receiveSpxxReq.getZzstsgl()); - commodityCodeEntity.setUserId(""); - commodityCodeEntity.setCreateTime(new Date()); - commodityCodeEntity.setModifyTime(new Date()); - commodityCodeEntity.setModifyUserId(""); commodityCodeEntity.setGroupId(""); commodityCodeEntity.setGroupName(""); commodityCodeEntity.setGroupCode(""); @@ -740,7 +740,7 @@ public class CommodityServiceImpl implements CommodityService { // commodityCodeEntity.setStatus("1"); commodityCodeEntity.setInvoiceName(CommonUtils.subSpmc(receiveSpxxReq.getXmmc())); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_6.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_11.getKey()); commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java index 2cfd1d69..4aba31aa 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.module.taxclass.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderManagementConstant; import com.dxhy.order.constant.ResponseStatusCodes; @@ -196,7 +197,7 @@ public class GroupTaxClassCodeServiceImpl implements GroupTaxClassCodeService { } } //数据来源为手工创建 - groupTaxClassCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); + groupTaxClassCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey()); //共享状态为待核实 groupTaxClassCodeEntity.setShareState(TaxClassCodeEnum.SHARE_STATE_1.getKey()); //数据状态为停用 @@ -511,7 +512,7 @@ public class GroupTaxClassCodeServiceImpl implements GroupTaxClassCodeService { String tempMerchandiseName = StringUtil.replaceStr(groupTaxClassCodeEntity.getMerchandiseName()); groupTaxClassCodeEntity.setMerchandiseName(tempMerchandiseName); groupTaxClassCodeEntity.setShareState(TaxClassCodeEnum.SHARE_STATE_1.getKey()); - groupTaxClassCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); + groupTaxClassCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_2.getKey()); //默认停用 groupTaxClassCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); if (StringUtils.isNotEmpty(groupTaxClassCodeEntity.getTaxClassificationName()) && StringUtils.isNotEmpty(groupTaxClassCodeEntity.getTaxClassCode())) { @@ -573,7 +574,7 @@ public class GroupTaxClassCodeServiceImpl implements GroupTaxClassCodeService { //单价 entity.setUnitPrice(commodityCodeEntity.getXmdj()); //数据来源 - entity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_3.getKey()); + entity.setDataSource(CommodityCodeEnum.DATA_SOURCE_3.getKey()); //匹配状态 entity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); //数据状态 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java index 4d44632d..44f1bf8a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java @@ -1,5 +1,6 @@ package com.dxhy.order.baseservice.module.vehicles.service.impl; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.constant.*; import com.dxhy.order.model.PageUtils; import com.dxhy.order.model.R; @@ -90,7 +91,7 @@ public class VehiclesServiceImpl implements VehiclesService { } if (StringUtils.isBlank(vehiclesCodeEntity.getDataSource())) { //设置数据来源 - vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); + vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey()); } VehiclesCodeEntity duplicateVehiclesCodeEntity = isDuplicate(vehiclesCodeEntity); if (Objects.isNull(duplicateVehiclesCodeEntity)) { @@ -219,7 +220,7 @@ public class VehiclesServiceImpl implements VehiclesService { vehiclesCodeEntity.setPreferentialPoliciesType(""); } //数据来源(0-集团共享；1-手工创建；2-模板导入；3-采集下级；) - vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); + vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_2.getKey()); //数据创建时间 vehiclesCodeEntity.setCreateTime(new Date()); //更新时间 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java index e1efc2d0..2b71e4c9 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.utils; import cn.hutool.core.date.DateUtil; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.TaxClassCodeEnum; @@ -99,7 +100,7 @@ public class BaseServiceBeanTransitionUtils { commodityCodeEntity.setCzlx(spxxtbReq.getCZLX()); commodityCodeEntity.setYcbz(ConfigureConstant.STRING_0); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_5.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_5.getKey()); return commodityCodeEntity; } diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java index e297673b..337d1ff7 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java @@ -25,11 +25,6 @@ public enum TaxClassCodeEnum { DATA_SOURCE_3("3", "采集下级"), DATA_SOURCE_4("4", "自动归集"),//物料更新没使用 DATA_SOURCE_5("5", "接口同步"), - DATA_SOURCE_6("6", "手工填开"), - DATA_SOURCE_7("7", "历史数据"), - DATA_SOURCE_8("8", "订单同步公司库"), - DATA_SOURCE_9("9", "引用集团库"), - DATA_SOURCE_10("10", "克隆公司库"), /** * 匹配状态 */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java index a84e0c66..dd26ee19 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.dxhy.base.rabbitmq.rabbitplugin.listener.BaseListener; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.service.CommodityService; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService; @@ -195,7 +196,7 @@ public class OrderSaveSpxxHandler implements BaseListener { vehiclesCodeEntity.setProducingEnterpriseName(scqymc); vehiclesCodeEntity.setEnjoyPreferentialPolicies(orderItemInfo.getYhzcbs()); vehiclesCodeEntity.setPreferentialPoliciesType(orderItemInfo.getLslbs()); - vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_4.getKey()); + vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_4.getKey()); vehiclesCodeEntity.setCreateTime(new Date()); vehiclesCodeEntity.setModifyTime(new Date()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java index ecdbd29c..c20040f7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java @@ -1,6 +1,6 @@ package com.dxhy.order.consumer.modules.commodity.service.impl; -import com.dxhy.order.baseservice.module.commodity.dao.GroupCommodityMapper; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.TaxClassCodeEnum; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; @@ -9,7 +9,6 @@ import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodit import com.dxhy.order.consumer.modules.commodity.service.ICompanyCommodityCodeService; import com.dxhy.order.consumer.utils.ValidateUtils; import com.dxhy.order.model.R; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,7 +44,7 @@ public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeSer ValidateUtils.validate(from); from.setUserId(userInfoService.getUser() != null&&userInfoService.getUser().getUserId()!= null?userInfoService.getUser().getUserId().toString():"clone"); - from.setDataSource(TaxClassCodeEnum.DATA_SOURCE_10.getKey()); + from.setDataSource(CommodityCodeEnum.DATA_SOURCE_10.getKey()); // 删除to公司下的所有物料 groupCommodityMapper.deleteCommodityCodeByXhfNsrsbh(to); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java index 951c7ee1..a0c35e6d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java @@ -2,6 +2,7 @@ package com.dxhy.order.consumer.modules.commodity.service.impl; import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; 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.service.UserInfoService; @@ -158,7 +159,7 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService }else{ newCommodityCodeEntity.setId(baseService.getGenerateShotKey()); newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh()); - newCommodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_9.getKey()); + newCommodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_9.getKey()); newCommodityCodeEntity.setDataState(ConfigureConstant.STRING_0); newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc()); newCommodityCodeEntity.setHsbz(ConfigureConstant.STRING_1); 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 d0e675be..ad0437b7 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 @@ -15,6 +15,7 @@ import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.groupmanagement.dao.GroupManagementMapper; import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; @@ -1975,7 +1976,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { comm.setZzstsgl(itemInfo.getZzstsgl()); //如果税编和简称对不上返回报错 comm.setXhfMc(orderInfoVo.getXhfMc()); - comm.setDataSource(TaxClassCodeEnum.DATA_SOURCE_8.getKey()); + comm.setDataSource(CommodityCodeEnum.DATA_SOURCE_8.getKey()); comm.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); comm.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); comm.setSpjc(spjc); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java index 946242b3..b500b368 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java @@ -21,6 +21,7 @@ import com.dxhy.order.baseservice.module.buyer.protocol.*; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; import com.dxhy.order.baseservice.module.buyer.service.VerifyBuyerManageInfoService; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.model.protocol.SpxxcxReqBO; import com.dxhy.order.baseservice.module.commodity.service.CommodityService; import com.dxhy.order.baseservice.module.commodity.service.VerifyCommodityCodeService; @@ -5484,7 +5485,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 { //单价 myEntity.setUnitPrice(null); //数据来源 - myEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_5.getKey()); + myEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_5.getKey()); //匹配状态 myEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); //数据状态 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 095b9724..1e460713 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -9,6 +9,7 @@ import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxCommonBO; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxtbReqBO; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.openapi.model.SksbxxtbReqBO; import com.dxhy.order.baseservice.openapi.protocol.qd.PageXfxx; @@ -3318,7 +3319,7 @@ public class BeanTransitionUtils { commodityCodeEntity.setCzlx(spxxtbReq.getCZLX()); commodityCodeEntity.setYcbz(ConfigureConstant.STRING_0); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_5.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_5.getKey()); return commodityCodeEntity; } diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml index 85a2eeed..8bab52fe 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml @@ -571,8 +571,8 @@ zzstsgl, #{from.userId,jdbcType=VARCHAR}, now(), - modify_time, - modify_user_id, + null, + '', group_id, #{to.xhfMc,jdbcType=VARCHAR}, #{from.dataSource,jdbcType=VARCHAR}, From 81eb078d168df7b2f47b230f3bc831ec79be9f06 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 13 Jun 2023 22:36:36 +0800 Subject: [PATCH 8/9] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/controller/CommodityController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index afbd66d4..6ba96bf9 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -528,7 +528,7 @@ public class CommodityController { } commodityCodeEntity.setSl(sl); - String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(commodityExcel.getGgxh()); + String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(StringUtils.isBlank(commodityExcel.getGgxh())?"":commodityExcel.getGgxh()); commodityCodeEntity.setGgxh(ggxh); commodityCodeEntity.setXmdw(StringUtils.isEmpty(commodityExcel.getDw()) ? "" : commodityExcel.getDw()); commodityCodeEntity.setXmdj(StringUtils.isEmpty(commodityExcel.getDj()) ? "" : commodityExcel.getDj()); From fd62a414f64675662216eb0f86e8e0d1304c23d2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 14 Jun 2023 09:21:25 +0800 Subject: [PATCH 9/9] =?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);