From f27bd5c18b64931b88af37dadde8d3bd1d54a20f Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 5 Jun 2023 19:30:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E7=BA=A2?= =?UTF-8?q?=E7=A5=A8=E6=B8=85=E5=8D=95=E6=A0=87=E5=BF=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GenerateReadyOpenOrderServiceImpl.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 4d941b1d..e498084a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -33,6 +33,7 @@ import com.dxhy.order.model.*; import com.dxhy.order.utils.CommonUtils; import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.utils.NsrsbhUtils; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -293,7 +294,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder // 补全明细信息 List orderItemList = commonOrderInfo.getOrderItemInfo(); - boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); + boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> StringUtils.isNotBlank(orderItemInfo.getSpbm()) && baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); if(kcp){ orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey()); if(orderItemList.size() > ConfigureConstant.INT_8){ @@ -314,6 +315,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder } + /** * 生成待开具订单 */ @@ -878,6 +880,29 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder } public static void main(String[] args) { + List list = Lists.newArrayList(); + list.add("1"); + list.add("2"); + list.add("3"); + list.add("4"); + String collect = list.stream().collect(Collectors.joining(",")); +// boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); +// if(kcp){ +// orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey()); +// if(orderItemList.size() > ConfigureConstant.INT_8){ +// orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_8.getKey()); +// } +// } + + String str1 = ""; + boolean b = list.stream().allMatch(l -> StringUtils.isNotBlank(str1) && collect.contains(str1)); + if(b){ + System.out.println("98458845"); + }else { + System.out.println("134567890"); + } + + String str = "差额征税：5000.00。aaaaa"; int indexOf = str.indexOf(ConfigureConstant.STRING_CEZS); int indexOf2 = str.indexOf("。"); From baf36758bb6c8e2cfbfb36a1c1b362bc0a7c0f05 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 6 Jun 2023 14:55:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4=EF=BC=8C=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=92=8C=E7=A8=8E=E5=8F=B7=E5=8F=96=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E8=A1=8C=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=8F=96=E4=B8=8B=E6=A0=870?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupManagementController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java index c528cee1..1b8574e1 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java @@ -61,18 +61,19 @@ public class GroupManagementController { groupManagementVO.setGroupName(groupManagementQuery.getGroupName()); groupManagementVO.setEntId(groupManagementQuery.getEntId()); if (CollectionUtil.isNotEmpty(groupManagementEntityList)) { - groupManagementVO.setGroupType(groupManagementEntityList.get(0).getGroupType()); - groupManagementVO.setXhfNsrsbh(groupManagementEntityList.get(0).getXhfNsrsbh()); - groupManagementVO.setXhfMc(groupManagementEntityList.get(0).getXhfMc()); + GroupManagementEntity groupManagementEntity = groupManagementEntityList.stream().filter(t -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_1.getKey().equals(t.getDefaultItem())).findFirst().orElse(groupManagementEntityList.get(0)); + groupManagementVO.setGroupType(groupManagementEntity.getGroupType()); + groupManagementVO.setXhfNsrsbh(groupManagementEntity.getXhfNsrsbh()); + groupManagementVO.setXhfMc(groupManagementEntity.getXhfMc()); if(StringUtils.isBlank(groupManagementVO.getEntId())){ - groupManagementVO.setEntId(groupManagementEntityList.get(0).getEntId()); + groupManagementVO.setEntId(groupManagementEntity.getEntId()); } - groupManagementVO.setUsingEntId(groupManagementEntityList.get(0).getUsingEntId()); + groupManagementVO.setUsingEntId(groupManagementEntity.getUsingEntId()); List taxPayerVOList = new ArrayList<>(); - groupManagementEntityList.forEach(groupManagementEntity -> { + groupManagementEntityList.forEach(t -> { TaxPayerVO taxPayerVO = new TaxPayerVO(); - BeanUtils.copyProperties(groupManagementEntity, taxPayerVO); + BeanUtils.copyProperties(t, taxPayerVO); taxPayerVOList.add(taxPayerVO); }); From 48880dc21304afd16376003e5858357520b4c598 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 6 Jun 2023 15:29:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feature=EF=BC=9A=E5=AF=BC=E5=85=A5=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B740=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/BaseServiceBeanTransitionUtils.java | 13 ++++++++++ .../service/impl/PushInvoiceServiceImpl.java | 3 --- .../consumer/utils/BeanTransitionUtils.java | 26 +++++-------------- 3 files changed, 20 insertions(+), 22 deletions(-) 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 0208968f..e1efc2d0 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 @@ -12,8 +12,11 @@ import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; import com.dxhy.order.baseservice.openapi.model.SksbxxtbReqBO; import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxBO; import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxtbReqBO; +import com.dxhy.order.utils.GbkUtil; +import com.dxhy.order.utils.StringUtil; import lombok.extern.slf4j.Slf4j; +import java.io.IOException; import java.util.Date; /** @@ -230,4 +233,14 @@ public class BaseServiceBeanTransitionUtils { return taxEquipmentInfo; } + + public static String ggxhTransition(String ggxh){ + if(GbkUtil.getGbkLength(ggxh) > ConfigureConstant.INT_40){ + try { + ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40); + } catch (IOException e) { + } + } + return ggxh; + } } 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 2f48e66b..51c8af61 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 @@ -114,9 +114,6 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { @Resource private OrderInfoQdMapper orderInfoQdMapper; - @Resource - private OrderInfoQdFjysMapper orderInfoQdFjysMapper; - @Resource private OrderProcessService orderProcessService; 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 ec7f8f38..55c4da32 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 @@ -14,6 +14,7 @@ import com.dxhy.order.baseservice.openapi.model.SksbxxtbReqBO; import com.dxhy.order.baseservice.openapi.protocol.qd.PageXfxx; import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxBO; import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxtbReqBO; +import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils; import com.dxhy.order.constant.*; import com.dxhy.order.consumer.openapi.protocol.Response; import com.dxhy.order.consumer.openapi.protocol.cpy.*; @@ -50,10 +51,7 @@ 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.CommonUtils; -import com.dxhy.order.utils.DecimalCalculateUtil; -import com.dxhy.order.utils.JsonUtils; -import com.dxhy.order.utils.StringUtil; +import com.dxhy.order.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -2154,6 +2152,9 @@ public class BeanTransitionUtils { commonOrderInfo.getOrderInfo().setGhfZh(buyerEntity.getBankNumber()); } + if (StringUtils.isBlank(commonOrderInfo.getOrderInfo().getGhfEmail())) { + commonOrderInfo.getOrderInfo().setGhfEmail(buyerEntity.getEmail()); + } } @@ -3549,19 +3550,8 @@ public class BeanTransitionUtils { ddmxxxBO.setDJ(detail.getZZDJ()); } if(StringUtils.isNotBlank(ddmxxxBO.getGGXH())){ - String ggxh = ddmxxxBO.getGGXH(); - try { - if (ggxh.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_40) { - log.debug("对明细行规格型号进行截取,截取前数据为:{}", ggxh); - ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40); - log.debug("对明细行规格型号进行截取,截取后数据为:{}", ggxh); - ddmxxxBO.setGGXH(ggxh); - } - } catch (IOException e) { - //编码格式错误 - log.error("处理商品名称异常：{}", e); - throw new RuntimeException(e); - } + String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(ddmxxxBO.getGGXH()); + ddmxxxBO.setGGXH(ggxh); } ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP).toString()); @@ -3825,6 +3815,4 @@ public class BeanTransitionUtils { return orderItemInfos; } - - } From f13a22eac9b2e7f98d51f49b09240690f4b54f9c Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 6 Jun 2023 18:05:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feature=EF=BC=9A=E8=B4=AD=E6=96=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8Cbuyer=5Fcode=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommodityController.java | 33 +++++++++++-------- .../commodity/model/CommodityCodeEnum.java | 14 +++++--- .../order/constant/OrderInfoContentEnum.java | 1 + .../order/controller/BuyerController.java | 2 +- 4 files changed, 30 insertions(+), 20 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 bf58ee9f..d2bf7c49 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,7 +11,6 @@ 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; @@ -21,6 +20,7 @@ import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.module.thirdservice.user.model.UserEntity; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.baseservice.openapi.protocol.qd.PageSpxxReq; +import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils; import com.dxhy.order.constant.*; import com.dxhy.order.model.CommodityCodeCheckQuery; import com.dxhy.order.model.CommodityTaxClassCodeReq; @@ -120,7 +120,10 @@ public class CommodityController { return R.error(OrderInfoContentEnum.MORE_NSRSBH_ERROR); } String nsrsbh = xfshs[0]; - + String entId = commodityCodeEntity.getEntId(); + if(StringUtils.isBlank(entId)){ + return R.error(OrderInfoContentEnum.MORE_ENTID_ERROR); + } commodityCodeEntity.setXhfNsrsbh(nsrsbh); log.info("参数：{}", JsonUtils.getInstance().toJsonString(commodityCodeEntity)); @@ -166,9 +169,8 @@ public class CommodityController { /** * 添加校验 */ - List commodityCodeEntityList = new ArrayList<>(); - commodityCodeEntityList.add(commodityCodeEntity); - List> maps = verifyCommodityCodeService.checkCommodityParams(commodityCodeEntityList, type, 0); + List commodityCodeEntities = Arrays.asList(commodityCodeEntity); + List> maps = verifyCommodityCodeService.checkCommodityParams(commodityCodeEntities, type, 0); if (ObjectUtil.isNotEmpty(maps)) { return R.error().put(OrderManagementConstant.DATA, maps); } @@ -335,12 +337,12 @@ public class CommodityController { } /** - * 同步集团税编接口 + * 同步集团税编接口,接口放弃如果需要启用则入库逻辑需要修改 * * @date: Created on 2018年7月25日 下午3:30:28 */ @ApiOperation(value = "同步集团税编接口", notes = "商品信息管理-同步集团税编接口") - @PostMapping("/syncGroupTaxClassCode") + //@PostMapping("/syncGroupTaxClassCode") @SysLog(operation = "同步集团税编接口", operationDesc = "同步集团税编接口", key = "同步集团税编接口") public R syncGroupTaxClassCode(@RequestBody() CommodityTaxClassCodeReq groupTaxList) { log.info("同步集团税编接口,入参：{}", groupTaxList); @@ -411,8 +413,9 @@ public class CommodityController { @ApiParam(name = "entId", value = "数据组织Id", required = false) @RequestParam(value = "entId", required = false) String entId, @ApiParam(name = "userId", value = "用户ID", required = true) @RequestParam(value = "userId") String userId) throws Exception { log.info("商品模板导入"); - - + if(StringUtils.isBlank(entId)||StringUtils.isBlank(userId)){ + return R.error("请求参数有误"); + } Map headToProperty = new HashMap<>(10); for (CommodityEnum flowStatus : CommodityEnum.values()) { @@ -472,7 +475,7 @@ public class CommodityController { * @param commodityExcelList * @return */ - public List transCommodityCodeEntityList(List commodityExcelList,String xhfNsrsbh,String xhfMc, String userId, String deptId) { + public List transCommodityCodeEntityList(List commodityExcelList,String xhfNsrsbh,String xhfMc, String userId, String entId) { List commodityCodeEntityList = new ArrayList<>(); if (ObjectUtil.isNotEmpty(commodityExcelList)) { for (CommodityExcel commodityExcel : commodityExcelList) { @@ -495,7 +498,9 @@ public class CommodityController { sl = CommonUtils.formatSl(sl); } commodityCodeEntity.setSl(sl); - commodityCodeEntity.setGgxh(commodityExcel.getGgxh()); + + String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(commodityExcel.getGgxh()); + commodityCodeEntity.setGgxh(ggxh); commodityCodeEntity.setXmdw(StringUtils.isEmpty(commodityExcel.getDw()) ? "" : commodityExcel.getDw()); commodityCodeEntity.setXmdj(StringUtils.isEmpty(commodityExcel.getDj()) ? "" : commodityExcel.getDj()); commodityCodeEntity.setHsbz(commodityExcel.getHsbz()); @@ -519,10 +524,10 @@ public class CommodityController { commodityCodeEntity.setSpjc(commodityExcel.getSpjc()); commodityCodeEntity.setBz(commodityExcel.getBz()); commodityCodeEntity.setCollectIdent(""); - commodityCodeEntity.setCpy(""); - commodityCodeEntity.setJdc(""); + commodityCodeEntity.setCpy(ConfigureConstant.STRING_N); + commodityCodeEntity.setJdc(ConfigureConstant.STRING_N); commodityCodeEntity.setBmbBbh(""); - commodityCodeEntity.setEntId(deptId); + commodityCodeEntity.setEntId(entId); commodityCodeEntity.setUserId(userId); if (StringUtils.isNotEmpty(commodityCodeEntity.getHsbz())) { 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 d3ea59d8..69f90de3 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 @@ -1,12 +1,16 @@ package com.dxhy.order.baseservice.module.commodity.model; +/** + * 不在使用，使用TaxClassCodeEnum里的枚举 + */ +@SuppressWarnings("") public enum CommodityCodeEnum { //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送 - DATA_SOURCE_0("0", "集团共享"), - DATA_SOURCE_1("1", "手工创建"), - DATA_SOURCE_2("2", "模板导入"), - DATA_SOURCE_3("3", "采集下级"), - DATA_SOURCE_4("4", "MDM推送"), + DATA_SOURCE_10("0", "集团共享"), + DATA_SOURCE_11("1", "手工创建"), + DATA_SOURCE_12("2", "模板导入"), + DATA_SOURCE_13("3", "采集下级"), + DATA_SOURCE_14("4", "MDM推送"), ; diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java index da04eb0d..fec87b22 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java @@ -59,6 +59,7 @@ public enum OrderInfoContentEnum { INVALID_ORDER_STATUS("9644", "无效订单"), MORE_NSRSBH_ERROR("9999", "请选择明确的销方信息进行操作"), + MORE_ENTID_ERROR("9999", "组织编码不允许为"), COMMON_ERROR("9999", "企业未配置税控设备"), QD_FW_ERROR("9999", "未开通全电业务，请联系运维人员"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java index 5428d088..bab3c16b 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java @@ -284,7 +284,7 @@ public class BuyerController { buyerEntity.setBankOfDeposit(buyerImportExcel.getGhfYh()); buyerEntity.setBankNumber(buyerImportExcel.getGhfZh()); buyerEntity.setRemarks(buyerImportExcel.getGhfBz()); - if(StringUtils.isBlank(buyerEntity.getBuyerCode())||"0000000000".equals(buyerEntity.getBuyerCode())){ + if(StringUtils.isBlank(buyerImportExcel.getGhfBm())||"0000000000".equals(buyerImportExcel.getGhfBm())){ String format = String.format("%s%s", sdf.format(new Date()), String.format("%6s", String.valueOf(new Random().nextInt(1000000))).replace(' ', '0')); buyerEntity.setBuyerCode(format); }else{ From c9064a39975c92fe20649067f1c14b36a853a4df Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 6 Jun 2023 20:04:51 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feature=EF=BC=9A=E8=8E=B7=E5=8F=96mdm?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=BA=93=EF=BC=8C=E4=B8=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=A8=8E=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); From 0cb5832401704fab215c10b9a168169393efa067 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 6 Jun 2023 20:09:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=87=8D=E6=96=B0=E6=A2=B3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CommodityServiceImpl.java | 37 ++--- .../mybatis/mapper/CommodityMapper.xml | 147 ++++++++++-------- .../dxhy/order/constant/TaxClassCodeEnum.java | 4 +- .../service/impl/OrderInfoServiceImpl.java | 8 +- 4 files changed, 96 insertions(+), 100 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 baf272eb..08831a9f 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 @@ -104,7 +104,6 @@ public class CommodityServiceImpl implements CommodityService { public R addOrEditCommodity(CommodityCodeEntity codeEntity) { List shList = NsrsbhUtils.transShListByNsrsbh(codeEntity.getXhfNsrsbh()); - boolean flag; //判断保存或者修改操作 String id = codeEntity.getId(); Map map = new HashMap<>(); @@ -141,15 +140,14 @@ public class CommodityServiceImpl implements CommodityService { } else { codeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); + codeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); + //未匹配默认为停用 + codeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); if (StringUtils.isNotEmpty(codeEntity.getSsflMc()) && StringUtils.isNotEmpty(codeEntity.getSpbm())) { //税收分类名称和税收分类编码都存在 codeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); //已匹配默认为启用 codeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); - } else { - codeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); - //未匹配默认为停用 - codeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); } if(commodityMapper.insertCommodity(codeEntity) <= 0){ @@ -251,7 +249,7 @@ public class CommodityServiceImpl implements CommodityService { if (StringUtils.isNotEmpty(commodityCodeCheckQuery.getSl())) { commodityCodeCheckQuery.setSl(CommonUtils.formatSl(commodityCodeCheckQuery.getSl())); } - map1.put("productName", xmmc); + //map1.put("productName", xmmc); map1.put("zxbm", zxbm); map1.put("entId",commodityCodeCheckQuery.getDeptId()); @@ -320,7 +318,7 @@ public class CommodityServiceImpl implements CommodityService { for (CommodityCodeEntity commodityCodeEntity : commodityCodeList) { commodityCodeEntity.setSpbm(StringUtil.fillZero(commodityCodeEntity.getSpbm(), ConfigureConstant.INT_19)); //ent_id + encoding + spmc - int i1 = commodityMapper.queryCountByEntAndEncode(commodityCodeEntity.getZxbm(), commodityCodeEntity.getXmmc(), commodityCodeEntity.getEntId()); + int i1 = commodityMapper.queryCountByEntAndEncode(commodityCodeEntity.getZxbm(), "", commodityCodeEntity.getEntId()); if(i1>0){ Map map = new HashMap<>(2); map.put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); @@ -339,7 +337,7 @@ public class CommodityServiceImpl implements CommodityService { commodityCodeEntity.setId(baseService.getGenerateShotKey()); commodityCodeEntity.setCommodityId(commodityCodeEntity.getId()); - log.debug("添加接口开始执行"); + log.debug("物料导入开始执行"); String name = commodityCodeEntity.getGroupName(); // 获取分组id if (StringUtils.isNotBlank(commodityCodeEntity.getGroupName())) { @@ -353,39 +351,28 @@ public class CommodityServiceImpl implements CommodityService { commodityCodeEntity.setXmmc(tempMerchandiseName); commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); + commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); + commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); if (StringUtils.isNotEmpty(commodityCodeEntity.getSsflMc()) && StringUtils.isNotEmpty(commodityCodeEntity.getSpbm())) { // 税收分类名称和税收分类编码都存在 commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); // 已匹配默认为启用 - } else { - commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); - commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); - // 未匹配默认为停用 } if (StringUtils.isNotBlank(commodityCodeEntity.getSl()) && commodityCodeEntity.getSl().contains(ConfigureConstant.STRING_PERCENT)) { commodityCodeEntity.setSl(CommonUtils.formatSl(commodityCodeEntity.getSl())); } - //成品油为空就设置默认值 - if (StringUtils.isEmpty(commodityCodeEntity.getCpy())) { - commodityCodeEntity.setCpy(ConfigureConstant.STRING_N); - } - //机动车为空就设置默认值 - if (StringUtils.isEmpty(commodityCodeEntity.getJdc())) { - commodityCodeEntity.setJdc(ConfigureConstant.STRING_N); - } i = commodityMapper.insertCommodity(commodityCodeEntity); - log.debug("添加成功"); - if (i > 0) { - num++; - } else { + if (i <= 0) { Map map = new HashMap<>(2); map.put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); map.put("msg", "第" + num + "行,添加失败"); resultMap.add(map); + continue; } + num++; } return R.ok().put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) @@ -426,7 +413,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(TaxClassCodeEnum.DATA_SOURCE_0.getKey());//接口已放弃不在使用 entity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); entity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); entity.setUserId(userId); 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 172a087b..af631f3f 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 @@ -242,64 +242,64 @@ update commodity_code - + commodity_id = #{commodityCode.commodityId,jdbcType=VARCHAR}, - + sort_id = #{commodityCode.sortId,jdbcType=BIGINT}, - + xhf_nsrsbh = #{commodityCode.xhfNsrsbh,jdbcType=VARCHAR}, - + merchandise_name = #{commodityCode.xmmc,jdbcType=VARCHAR}, - + encoding = #{commodityCode.zxbm,jdbcType=VARCHAR}, - + tax_items = #{commodityCode.spsm,jdbcType=VARCHAR}, - + brief_code = #{commodityCode.spjm,jdbcType=VARCHAR}, - + tax_rate = #{commodityCode.sl,jdbcType=VARCHAR}, - + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, - + metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR}, - + unit_price = #{commodityCode.xmdj,jdbcType=VARCHAR}, - + tax_logo = #{commodityCode.hsbz,jdbcType=VARCHAR}, - + hide_the_logo = #{commodityCode.ycbz,jdbcType=VARCHAR}, - + enjoy_preferential_policies = #{commodityCode.yhzcbs,jdbcType=VARCHAR}, - + tax_class_code = #{commodityCode.spbm,jdbcType=VARCHAR}, - + tax_classification_name = #{commodityCode.ssflMc,jdbcType=VARCHAR}, - + preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR}, - + zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR}, - + user_id = #{commodityCode.userId,jdbcType=VARCHAR}, - + create_time = #{commodityCode.createTime,jdbcType=TIMESTAMP}, @@ -308,55 +308,55 @@ modify_time = SYSDATE, - + modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR}, - + group_id = #{commodityCode.groupId,jdbcType=VARCHAR}, - + description = #{commodityCode.bz,jdbcType=VARCHAR}, - + enterprise_name = #{commodityCode.xhfMc,jdbcType=VARCHAR}, - + data_source = #{commodityCode.dataSource,jdbcType=VARCHAR}, - + matching_state = #{commodityCode.matchingState,jdbcType=VARCHAR}, - + data_state = #{commodityCode.dataState,jdbcType=VARCHAR}, - + tax_class_abbreviation = #{commodityCode.spjc,jdbcType=VARCHAR}, - + collect_ident = #{commodityCode.collectIdent,jdbcType=VARCHAR}, - + cpy = #{commodityCode.cpy,jdbcType=VARCHAR}, - + bmb_bbh = #{commodityCode.bmbBbh,jdbcType=VARCHAR}, - + jdc = #{commodityCode.jdc,jdbcType=VARCHAR}, - + wlflbm = #{commodityCode.wlflbm,jdbcType=VARCHAR}, - + wlflmc = #{commodityCode.wlflmc,jdbcType=VARCHAR}, - + ent_id = #{commodityCode.entId,jdbcType=VARCHAR}, - + tswl = #{commodityCode.tswl,jdbcType=VARCHAR}, - + invoice_name = #{commodityCode.invoiceName,jdbcType=VARCHAR}, @@ -388,28 +388,28 @@ update commodity_code - + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, - + metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR}, - + hide_the_logo = #{commodityCode.ycbz,jdbcType=VARCHAR}, - + preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR}, - + enjoy_preferential_policies = #{commodityCode.yhzcbs,jdbcType=VARCHAR}, - + tax_class_code = #{commodityCode.spbm,jdbcType=VARCHAR}, - + tax_class_abbreviation = #{commodityCode.spjc,jdbcType=VARCHAR}, - + zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR}, @@ -418,16 +418,19 @@ modify_time = SYSDATE, - + modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR}, - + collect_ident = #{commodityCode.collectIdent,jdbcType=VARCHAR}, - + cpy = #{commodityCode.cpy,jdbcType=VARCHAR}, + + data_source = #{commodityCode.dataSource,jdbcType=VARCHAR}, + @@ -443,60 +446,66 @@ update commodity_code - + encoding = #{commodityCode.zxbm,jdbcType=VARCHAR}, - + metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR}, - + create_time = #{commodityCode.createTime,jdbcType=TIMESTAMP}, - + + modify_time = #{commodityCode.modifyTime,jdbcType=TIMESTAMP}, + + description = #{commodityCode.bz,jdbcType=VARCHAR}, - + wlflbm = #{commodityCode.wlflbm,jdbcType=VARCHAR}, - + wlflmc = #{commodityCode.wlflmc,jdbcType=VARCHAR}, - + specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR}, - + commodity_id = #{commodityCode.commodityId,jdbcType=VARCHAR}, - + sort_id = #{commodityCode.sortId,jdbcType=BIGINT}, - + merchandise_name = #{commodityCode.xmmc,jdbcType=VARCHAR}, - + zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR}, - + tax_class_abbreviation = #{commodityCode.spjc,jdbcType=VARCHAR}, - + tax_class_code = #{commodityCode.spbm,jdbcType=VARCHAR}, - + tax_classification_name = #{commodityCode.ssflMc,jdbcType=VARCHAR}, - + enjoy_preferential_policies = #{commodityCode.yhzcbs,jdbcType=VARCHAR}, - + tax_logo = #{commodityCode.hsbz,jdbcType=VARCHAR}, - + brief_code = #{commodityCode.spjm,jdbcType=VARCHAR}, - + tax_rate = #{commodityCode.sl,jdbcType=VARCHAR}, + + data_source = #{commodityCode.dataSource,jdbcType=VARCHAR}, + id in @@ -1264,12 +1273,12 @@ cc.encoding =#{encoding} - - and cc.merchandise_name =#{merchandiseName} - and cc.ent_id =#{entId} + + and cc.merchandise_name =#{merchandiseName} + 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 11abf315..27cfc18e 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 @@ -19,11 +19,11 @@ public enum TaxClassCodeEnum { /** * 数据来源 */ - DATA_SOURCE_0("0", "集团共享"), + DATA_SOURCE_0("0", "集团共享"),//放弃使用 DATA_SOURCE_1("1", "手工创建"), DATA_SOURCE_2("2", "模板导入"), DATA_SOURCE_3("3", "采集下级"), - DATA_SOURCE_4("4", "自动归集"), + DATA_SOURCE_4("4", "自动归集"),//物料更新没使用 DATA_SOURCE_5("5", "接口同步"), DATA_SOURCE_6("6", "开票自动归集"), /** 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 544dd9c4..b27abf7b 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 @@ -1824,13 +1824,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { // 如果公司物料库匹配失败，从集团物料库匹配 if (commodityCodeEntity == null) { // 如果匹配不到，则去集团物料库匹配 - commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(orderItemInfo.getZxbm(), "-1",null); + commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(orderItemInfo.getZxbm(), ConfigureConstant.STRING_1_,null); } - if(commodityCodeEntity != null){ completeCommodityMessageBySpid(orderItemInfo, commodityCodeEntity); - orderItemInfo.setZnfm(ConfigureConstant.STRING_0); + String znfm = ConfigureConstant.STRING_1_.equals(commodityCodeEntity.getXhfNsrsbh())?ConfigureConstant.STRING_1:ConfigureConstant.STRING_0; + orderItemInfo.setZnfm(znfm); orderItemInfo.setXmsl(null); orderItemInfo.setXmdj(null); } @@ -2011,7 +2011,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if (!OrderInfoEnum.FPHXZ_CODE_1.getKey().equals(item.getFphxz())) { //规格型号 if (StringUtils.isNotBlank(commodity.getGgxh())) { - item.setGgxh(commodity.getGgxh()); + item.setGgxh(commodity.getGgxh().trim()); } //单位 if (StringUtils.isNotBlank(commodity.getXmdw())) { From a5c13192ec82a44867a62c93ca74c9ab8280c9c2 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Thu, 8 Jun 2023 14:27:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?task4216=20ofd=E8=BD=ACpng=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BD=BF=E7=94=A8=E5=BD=B1=E5=83=8F=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-consumer/src/main/resources/bootstrap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index f3c94e37..e3025400 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -6,10 +6,10 @@ spring: name: order-api profiles: # Spring 配置文件读取 -# active: @deployType@ + active: @deployType@ # active: own # active: std - active: dev +# active: dev #active: test jackson: # jackson 日期格式化