From 7e815f14280288d317fcea8f3967089ee657936d Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 16:35:07 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99=E3=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=85=B7=E5=8F=96=E5=BC=80=E7=A5=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserInfoServiceImpl.java | 29 +++-- .../com/dxhy/order/utils/CheckParamUtil.java | 8 ++ .../order/controller/OrderInfoController.java | 13 ++ .../order/service/OrderInfoService.java | 2 + .../service/impl/OrderInfoServiceImpl.java | 123 ++++++++++++++++++ .../mybatis/mapper/OrderItemInfoMapper.xml | 34 ++++- 6 files changed, 191 insertions(+), 18 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index 513f8915..cff66791 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -447,21 +447,22 @@ public class UserInfoServiceImpl implements UserInfoService { if (entityList != null && entityList.size() > 0) { //选出默认项 Optional groupManagementEntityOptional = entityList.stream() - .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())) - .findFirst(); + .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())).findFirst(); GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.orElseGet(() -> entityList.get(0)); - deptEntityNew = new DeptEntity(); - deptEntityNew.setDeptId(deptEntity.getDeptId()); - deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh()); - //todo 虚拟组织：组织名称和销方名称公用此字段会有问题，后期优化 - deptEntityNew.setName(groupManagementEntity.getGroupName()); - deptEntityNew.setTaxpayerName(groupManagementEntity.getXhfMc()); - deptEntityNew.setTaxpayerAddress(groupManagementEntity.getXhfDz()); - deptEntityNew.setTaxpayerPhone(groupManagementEntity.getXhfDh()); - deptEntityNew.setTaxpayerBank(groupManagementEntity.getXhfYh()); - deptEntityNew.setTaxpayerAccount(groupManagementEntity.getXhfZh()); - deptEntityNew.setInvoiceName(groupManagementEntity.getXhfMc()); - deptEntityNew.setInvoiceNsrsbh(groupManagementEntity.getXhfNsrsbh()); + if(StringUtils.isNotBlank(groupManagementEntity.getXhfNsrsbh())){ + deptEntityNew = new DeptEntity(); + deptEntityNew.setDeptId(deptEntity.getDeptId()); + deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh()); + //todo 虚拟组织：组织名称和销方名称公用此字段会有问题，后期优化 + deptEntityNew.setName(groupManagementEntity.getGroupName()); + deptEntityNew.setTaxpayerName(groupManagementEntity.getXhfMc()); + deptEntityNew.setTaxpayerAddress(groupManagementEntity.getXhfDz()); + deptEntityNew.setTaxpayerPhone(groupManagementEntity.getXhfDh()); + deptEntityNew.setTaxpayerBank(groupManagementEntity.getXhfYh()); + deptEntityNew.setTaxpayerAccount(groupManagementEntity.getXhfZh()); + deptEntityNew.setInvoiceName(groupManagementEntity.getXhfMc()); + deptEntityNew.setInvoiceNsrsbh(groupManagementEntity.getXhfNsrsbh()); + } } return deptEntityNew; } diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/CheckParamUtil.java b/order-management-common/src/main/java/com/dxhy/order/utils/CheckParamUtil.java index 162f4925..bf2c4b28 100644 --- a/order-management-common/src/main/java/com/dxhy/order/utils/CheckParamUtil.java +++ b/order-management-common/src/main/java/com/dxhy/order/utils/CheckParamUtil.java @@ -239,4 +239,12 @@ public class CheckParamUtil { return errorMap; } + public static void main(String[] args) { + try { + CheckParamUtil.checkParam(OrderInfoContentEnum.CHECK_ISS7PRI_107059, "塑料（ABS）_防静电_华信V-PRO矿工帽 带矿", ""); + //System.out.println("塑料（ABS）_防静电_华信V-PRO矿工帽 带矿".getBytes("GBK").length); + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 2f0d9cdf..48302960 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -455,4 +455,17 @@ public class OrderInfoController { return R.error("系统异常，请联系管理员"); } } + + @ApiOperation(value = "订单更新物料", notes = "订单信息管理-更新物料") + @PostMapping("/updateOrderItem") + @SysLog(operation = "订单更新物料", operationDesc = "订单更新物料", key = "订单更新物料") + public R updateOrderItem(@RequestParam("orderInfoId")String orderInfoId,@RequestParam("entId")String entId){ + try { + return orderInfoService.updateOrderItem(orderInfoId,entId); + } catch (Exception e) { + log.error(e.getMessage()); + return R.error("系统异常"); + } + + } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java index 760bca53..57e5a522 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java @@ -214,4 +214,6 @@ public interface OrderInfoService { @Transactional R logicalDeleteByOrderInfoId(List pageRequestList); + + R updateOrderItem(String orderInfoId,String entId); } 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 d9819fa8..50c24c6e 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 @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.dxhy.base.constant.OrderSeparationException; import com.dxhy.base.constant.TaxSeparateConfig; import com.dxhy.base.utils.PriceTaxSeparationUtilNew; @@ -11,6 +12,9 @@ import com.dxhy.common.generatepdf.util.EwmUtil; import com.dxhy.order.baseservice.config.BaseServiceConfig; 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.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.simsback.service.SimsBackService; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; @@ -18,6 +22,7 @@ import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.OrderManagementConstant; +import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.dao.OrderBatchRequestMapper; import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.model.OderDetailInfo; @@ -154,6 +159,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Resource private SpecialInvoiceReversalMapper specialInvoiceReversalMapper; + @Resource + private GroupCommodityCodeMapper commodityCodeMapper; + + @Resource + private TaxClassCodeMapper taxClassCodeMapper; + @Resource private OrderBatchRequestMapper orderBatchRequestMapper; @@ -1792,6 +1803,118 @@ public class OrderInfoServiceImpl implements OrderInfoService { return R.ok(); } + @Override + public R updateOrderItem(String orderInfoId,String entId){ + //根据订单id查询明细数据 + List orderItemInfos = orderItemInfoMapper.selectAllByOrderId(Arrays.asList(orderInfoId), null); + List orderItemInfoList = new ArrayList<>(); + for (OrderItemInfo orderItemInfo : orderItemInfos) { + if(StringUtils.isNotBlank(orderItemInfo.getSpbm())){ + continue; + } + CommodityCodeEntity commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(orderItemInfo.getZxbm(), null, entId); + // 如果公司物料库匹配失败，从集团物料库匹配 + if (commodityCodeEntity == null) { + // 如果匹配不到，则去集团物料库匹配 + commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(orderItemInfo.getZxbm(), "-1",null); + + } + + if(commodityCodeEntity != null){ + completeCommodityMessageBySpid(orderItemInfo, commodityCodeEntity); + orderItemInfo.setZnfm(ConfigureConstant.STRING_1); + orderItemInfo.setXmsl(null); + orderItemInfo.setXmdj(null); + } + orderItemInfoList.add(orderItemInfo); + } + if(!orderItemInfoList.isEmpty()){ + orderItemInfoMapper.updateOrderItemId(orderItemInfoList); + } + return R.ok(); + } + + private void completeCommodityMessageBySpid(OrderItemInfo item, CommodityCodeEntity commodity) { + //商品编码 + if (StringUtils.isBlank(item.getSpbm()) && StringUtils.isNotBlank(commodity.getSpbm())) { + item.setSpbm(commodity.getSpbm()); + } + + //自行编码 + if (StringUtils.isBlank(item.getZxbm()) && StringUtils.isNotBlank(commodity.getZxbm())) { + item.setZxbm(commodity.getZxbm()); + } + + //优惠政策标识 + if (StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isNotBlank(commodity.getYhzcbs())) { + item.setYhzcbs(commodity.getYhzcbs()); + }else if(StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isBlank(commodity.getYhzcbs())){ + item.setYhzcbs(ConfigureConstant.STRING_0); + } + + //零税率标识 + if (StringUtils.isBlank(item.getLslbs()) && StringUtils.isNotBlank(commodity.getLslbs())) { + item.setLslbs(commodity.getLslbs()); + } + + //增值税特殊管理 + if (StringUtils.isBlank(item.getZzstsgl()) && StringUtils.isNotBlank(commodity.getZzstsgl())) { + item.setZzstsgl(commodity.getZzstsgl()); + } + + //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 + String spmc = item.getXmmc(); + StringBuilder stringBuilder = new StringBuilder(); + if (StringUtils.isBlank(spmc)) { + if(StrUtil.isNotBlank(commodity.getInvoiceName())){ + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString(); + }else{ + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + } + } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) { + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString(); + } + item.setXmmc(spmc); + + //发票行性质为折扣行,不补全,单价,数量,单位,规格型号 + if (!OrderInfoEnum.FPHXZ_CODE_1.getKey().equals(item.getFphxz())) { + //规格型号 + if (StringUtils.isBlank(item.getGgxh()) && StringUtils.isNotBlank(commodity.getGgxh())) { + item.setGgxh(commodity.getGgxh()); + } + //单位 + if (StringUtils.isBlank(item.getXmdw()) && StringUtils.isNotBlank(commodity.getXmdw())) { + item.setXmdw(commodity.getXmdw()); + } + //商品数量 + if (StringUtils.isBlank(item.getXmsl())) { + item.setXmsl(""); + } + //单价 + if (StringUtils.isBlank(item.getXmdj()) && StringUtils.isNotBlank(commodity.getXmdj())) { + item.setXmdj(commodity.getXmdj()); + } + } + + //含税标志 + if (StringUtils.isBlank(item.getHsbz()) && StringUtils.isNotBlank(commodity.getHsbz())) { + item.setHsbz(commodity.getHsbz()); + } + + //如果税率为空使用查询到的税率否则使用原税率 + if (StringUtils.isBlank(item.getSl()) && StringUtils.isNotBlank(commodity.getSl())) { + item.setSl(CommonUtils.formatSl(commodity.getSl())); + } + if(StringUtils.isBlank(item.getTswl()) && StringUtils.isNotBlank(commodity.getTswl())){ + item.setTswl(commodity.getTswl()); + } + + //税额 + if (StringUtils.isBlank(item.getSe())) { + item.setSe(""); + } + } + private PageKySlRsp getDefaultKySlList(OrderInfoEnum orderInfoEnum){ PageKySlRsp pageKySlRsp = new PageKySlRsp(); pageKySlRsp.setSl(orderInfoEnum.getKey()); diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml index 3f582aad..b3eafcff 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml @@ -274,18 +274,44 @@ UPDATE order_item_info - + xmsl = #{item.xmsl,jdbcType=VARCHAR}, - + xmdj = #{item.xmdj,jdbcType=VARCHAR}, - + xmdw = #{item.xmdw,jdbcType=VARCHAR}, - + znfm = #{item.znfm,jdbcType=VARCHAR}, + + + xmmc = #{item.xmmc,jdbcType=VARCHAR}, + + + ggxh = #{item.ggxh,jdbcType=VARCHAR}, + + + hsbz = #{item.hsbz,jdbcType=VARCHAR}, + + + + spbm = #{item.spbm,jdbcType=VARCHAR}, + + + yhzcbs = #{item.yhzcbs,jdbcType=VARCHAR}, + + + lslbs = #{item.lslbs,jdbcType=VARCHAR}, + + + zzstsgl = #{item.zzstsgl,jdbcType=VARCHAR}, + + + tswl = #{item.tswl,jdbcType=VARCHAR}, + id = #{item.id,jdbcType=VARCHAR} From 5afc8c64cd27a1f01e481685ea8887fe6370e7ca Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 17:20:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feature=EF=BC=9A=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=85=B7=E8=8E=B7=E5=8F=96=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/UserInfoServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index cff66791..a0d4fa7b 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -446,10 +446,11 @@ public class UserInfoServiceImpl implements UserInfoService { List entityList = groupManagementService.queryByGroupIdList(groupIdList); if (entityList != null && entityList.size() > 0) { //选出默认项 - Optional groupManagementEntityOptional = entityList.stream() - .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())).findFirst(); - GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.orElseGet(() -> entityList.get(0)); - if(StringUtils.isNotBlank(groupManagementEntity.getXhfNsrsbh())){ + List collect = entityList.stream() + .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())).collect(Collectors.toList()); + GroupManagementEntity groupManagementEntity = null; + if(!collect.isEmpty()){ + groupManagementEntity = collect.get(0); deptEntityNew = new DeptEntity(); deptEntityNew.setDeptId(deptEntity.getDeptId()); deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh()); From 3ca81badcee10786ce5d53382baa29cd14f20d86 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 18:32:04 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E6=8E=A5=E5=8F=A3=E5=B7=B2=E5=BC=80=E5=85=B7=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=85=A8=E9=83=A8=E5=86=B2=E7=BA=A2=E6=88=96?= =?UTF-8?q?=E8=80=85=E4=BD=9C=E5=BA=9F=EF=BC=8C=E5=85=81=E8=AE=B8=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/openapi/service/impl/InterfaceServiceImplV6.java | 4 ++-- .../com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 2 +- order-management-consumer/src/main/resources/bootstrap.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java index bb9c7c6d..bfa83a0d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java @@ -148,7 +148,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { queryMap.put("bzdh",bzdh); List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(queryMap, null, null); //过滤留下有效订单，且判断有效订单是否存在开票中、已开票 - esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ esOutput.setZMESSAGE("根据报账单号未查询到唯一结算单"); poCommonResponseParam.setES_OUTPUT(esOutput); @@ -202,7 +202,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { return poCommonResponseParam; } - esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); + //esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); esOutput.setZMESSAGE("驳回状态更新成功"); poCommonResponseParam.setES_OUTPUT(esOutput); return poCommonResponseParam; 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 423f84a0..97fb0ae8 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 @@ -3603,7 +3603,7 @@ public class BeanTransitionUtils { EsOutput esOutput = new EsOutput(); esOutput.setBSKEY(ddpcxxRspV5.getDDQQPCH()); esOutput.setSAPKEY(ddpcxxRspV5.getDDQQPCH()); - if (OrderInfoContentEnum.INVOICE_ERROR_CODE_010000_V3.getKey().equals(ddpcxxRspV5.getZTDM())) { + if (OrderInfoContentEnum.INVOICE_ERROR_CODE_010000_V3.getKey().equals(ddpcxxRspV5.getZTDM())||OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3.getKey().equals(ddpcxxRspV5.getZTDM())) { esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); } else { esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index e3a47db7..d8ede0bf 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -39,7 +39,7 @@ sims: #订单数据库类型区分,要么mysql,要么Oracle,要么weblogic db: mysql #订单redis数据库类型区分,要么redis,要么redis-sentinel - redisDb: redis-sentinel + redisDb: redis # 0 mysql 1 oracle dataType: 0 From fabfd5f47a18cf97328ce9bb4ed112077b691b84 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 19:04:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/controller/OrderInfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 48302960..54b50529 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -459,9 +459,9 @@ public class OrderInfoController { @ApiOperation(value = "订单更新物料", notes = "订单信息管理-更新物料") @PostMapping("/updateOrderItem") @SysLog(operation = "订单更新物料", operationDesc = "订单更新物料", key = "订单更新物料") - public R updateOrderItem(@RequestParam("orderInfoId")String orderInfoId,@RequestParam("entId")String entId){ + public R updateOrderItem(@RequestParam("orderId")String orderId,@RequestParam("entId")String entId){ try { - return orderInfoService.updateOrderItem(orderInfoId,entId); + return orderInfoService.updateOrderItem(orderId,entId); } catch (Exception e) { log.error(e.getMessage()); return R.error("系统异常"); From 61bd07d8ef5042dfd4416f6e2887a2c4b8c7caa6 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 19:26:13 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderInfoServiceImpl.java | 50 ++++--------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 50c24c6e..409326e2 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 @@ -1809,9 +1809,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { List orderItemInfos = orderItemInfoMapper.selectAllByOrderId(Arrays.asList(orderInfoId), null); List orderItemInfoList = new ArrayList<>(); for (OrderItemInfo orderItemInfo : orderItemInfos) { - if(StringUtils.isNotBlank(orderItemInfo.getSpbm())){ - continue; - } +// if(StringUtils.isNotBlank(orderItemInfo.getSpbm())){ +// continue; +// } CommodityCodeEntity commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(orderItemInfo.getZxbm(), null, entId); // 如果公司物料库匹配失败，从集团物料库匹配 if (commodityCodeEntity == null) { @@ -1822,7 +1822,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(commodityCodeEntity != null){ completeCommodityMessageBySpid(orderItemInfo, commodityCodeEntity); - orderItemInfo.setZnfm(ConfigureConstant.STRING_1); + orderItemInfo.setZnfm(ConfigureConstant.STRING_0); orderItemInfo.setXmsl(null); orderItemInfo.setXmdj(null); } @@ -1836,14 +1836,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { private void completeCommodityMessageBySpid(OrderItemInfo item, CommodityCodeEntity commodity) { //商品编码 - if (StringUtils.isBlank(item.getSpbm()) && StringUtils.isNotBlank(commodity.getSpbm())) { - item.setSpbm(commodity.getSpbm()); - } - - //自行编码 - if (StringUtils.isBlank(item.getZxbm()) && StringUtils.isNotBlank(commodity.getZxbm())) { - item.setZxbm(commodity.getZxbm()); - } + item.setSpbm(commodity.getSpbm()); //优惠政策标识 if (StringUtils.isBlank(item.getYhzcbs()) && StringUtils.isNotBlank(commodity.getYhzcbs())) { @@ -1853,14 +1846,11 @@ public class OrderInfoServiceImpl implements OrderInfoService { } //零税率标识 - if (StringUtils.isBlank(item.getLslbs()) && StringUtils.isNotBlank(commodity.getLslbs())) { - item.setLslbs(commodity.getLslbs()); - } + item.setLslbs(commodity.getLslbs()); //增值税特殊管理 - if (StringUtils.isBlank(item.getZzstsgl()) && StringUtils.isNotBlank(commodity.getZzstsgl())) { - item.setZzstsgl(commodity.getZzstsgl()); - } + item.setZzstsgl(commodity.getZzstsgl()); + //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 String spmc = item.getXmmc(); @@ -1879,40 +1869,22 @@ public class OrderInfoServiceImpl implements OrderInfoService { //发票行性质为折扣行,不补全,单价,数量,单位,规格型号 if (!OrderInfoEnum.FPHXZ_CODE_1.getKey().equals(item.getFphxz())) { //规格型号 - if (StringUtils.isBlank(item.getGgxh()) && StringUtils.isNotBlank(commodity.getGgxh())) { + if (StringUtils.isNotBlank(commodity.getGgxh())) { item.setGgxh(commodity.getGgxh()); } //单位 - if (StringUtils.isBlank(item.getXmdw()) && StringUtils.isNotBlank(commodity.getXmdw())) { + if (StringUtils.isNotBlank(commodity.getXmdw())) { item.setXmdw(commodity.getXmdw()); } - //商品数量 - if (StringUtils.isBlank(item.getXmsl())) { - item.setXmsl(""); - } - //单价 - if (StringUtils.isBlank(item.getXmdj()) && StringUtils.isNotBlank(commodity.getXmdj())) { - item.setXmdj(commodity.getXmdj()); - } } //含税标志 if (StringUtils.isBlank(item.getHsbz()) && StringUtils.isNotBlank(commodity.getHsbz())) { item.setHsbz(commodity.getHsbz()); } - - //如果税率为空使用查询到的税率否则使用原税率 - if (StringUtils.isBlank(item.getSl()) && StringUtils.isNotBlank(commodity.getSl())) { - item.setSl(CommonUtils.formatSl(commodity.getSl())); - } - if(StringUtils.isBlank(item.getTswl()) && StringUtils.isNotBlank(commodity.getTswl())){ + if(StringUtils.isNotBlank(commodity.getTswl())){ item.setTswl(commodity.getTswl()); } - - //税额 - if (StringUtils.isBlank(item.getSe())) { - item.setSe(""); - } } private PageKySlRsp getDefaultKySlList(OrderInfoEnum orderInfoEnum){ From 26a9554628fdcb3d978cbaf1ff1dd0082ff1d030 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 19:46:47 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 409326e2..ae152e9b 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 @@ -1859,7 +1859,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(StrUtil.isNotBlank(commodity.getInvoiceName())){ spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString(); }else{ - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); + spmc = stringBuilder.append(commodity.getXmmc()).toString(); } } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) { spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString(); From dd50cba1cb632d62f6f2258ccc220077b454dbfd Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 20:31:18 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ae152e9b..fa28b328 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 @@ -1862,7 +1862,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { spmc = stringBuilder.append(commodity.getXmmc()).toString(); } } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) { - spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); } item.setXmmc(spmc); From 9df67caf73926846afbc5ae706182eaf21e46132 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 20:46:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa28b328..9c0277be 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 @@ -1859,7 +1859,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(StrUtil.isNotBlank(commodity.getInvoiceName())){ spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString(); }else{ - spmc = stringBuilder.append(commodity.getXmmc()).toString(); + spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString(); } } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) { spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString();