From 665d52776a926e748f998279936df977b484d4d2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 2 May 2023 19:29:32 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=8F=91=E7=A5=A8=E5=BC=80?= =?UTF-8?q?=E5=85=B7=E3=80=81=E5=8F=91=E7=A5=A8=E6=9F=A5=E8=AF=A2=E6=8C=89?= =?UTF-8?q?=E7=85=A7ent=5Fid=20=E9=99=8D=E7=BB=B4=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/openapi/service/impl/InterfaceServiceImplV6.java | 1 + .../com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 1 + .../invoice/module/invoice/controller/InvoiceController.java | 4 ++-- 3 files changed, 4 insertions(+), 2 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 de6a58ce..1d148f5d 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 @@ -160,6 +160,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { PageRequestVO pageRequestVO = new PageRequestVO(); pageRequestVO.setOrderProcessId(t.getId()); pageRequestVO.setXhfNsrsbh(t.getXhfNsrsbh()); + pageRequestVO.setFpqqlsh(t.getFpqqlsh()); return pageRequestVO; }).collect(Collectors.toList()); if(pageRequestList.size() != collect.size()){ 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 1ffc3726..3b73e1b7 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 @@ -3473,6 +3473,7 @@ public class BeanTransitionUtils { ddpcxxBO.setNSRSBH(deptEntity.getInvoiceNsrsbh()); ddpcxxBO.setFPLXDM(CommonUtils.transSnFplxdm(req.getZFPLX())); ddpcxxBO.setKPFS(ConfigureConstant.STRING_1); + ddpcxxBO.setENTID(deptEntity.getDeptId()); //订单头信息 ddtxxBO.setDDQQLSH(isinput.getSAPKEY()); ddtxxBO.setKPLX(req.getZSFHZ()); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java index c0009874..23e6e24a 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java @@ -90,9 +90,9 @@ public class InvoiceController { List shList = NsrsbhUtils.transShListByXhfNsrsbh(orderBatchQuery.getXhfNsrsbh()); List entList = NsrsbhUtils.transShListByXhfNsrsbh(orderBatchQuery.getEntList()); - PageUtils pageUtils = orderInvoiceInfoService.selectRedAndInvoiceByMap(paramMap, shList, entList); + PageUtils pageUtils = orderInvoiceInfoService.selectRedAndInvoiceByMap(paramMap, null, entList); - QueryCountInvoiceBO queryCountInvoiceBO = orderInvoiceInfoService.queryCountByMap(paramMap, shList, entList); + QueryCountInvoiceBO queryCountInvoiceBO = orderInvoiceInfoService.queryCountByMap(paramMap, null, entList); log.info("{}发票明细统计返回值{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(queryCountInvoiceBO));