From 2a8f951cbd9b17a4dfd55033e4b21f1026f8d3d5 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Fri, 28 Jul 2023 11:03:39 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=A1=A5=E5=BD=95=E6=8A=A5?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=E8=87=AA=E5=8A=A8=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?SAP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderInfoController.java     |  7 +++++--
 .../modules/order/service/OrderInfoService.java   |  2 +-
 .../order/service/impl/OrderInfoServiceImpl.java  | 15 +++++++++++++--
 3 files changed, 19 insertions(+), 5 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 ee5d09f0..2d1f59fd 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
@@ -165,12 +165,15 @@ public class OrderInfoController {
     @PostMapping("/updateBillNumber")
     @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号")
     @SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理")
-    public R updateBillNumber(@RequestParam("bzdh") String bzdh, @RequestParam("orderInfoId") String orderInfoId) {
+    public R updateBillNumber(@RequestParam("bzdh") String bzdh,
+                              @RequestParam("orderInfoId") String orderInfoId,
+                              @RequestParam("fpqqlsh")String fpqqlsh,
+                              @RequestParam("xhfNsrsbh")String xhfNsrsbh) {
         if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){
             return R.error("请求参数有误");
         }
         try {
-            int i = orderInfoService.updateBillNumber(bzdh, orderInfoId);
+            int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh);
             if(i > 0){
                 return R.ok();
             }
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 c366bf0b..35a61a6c 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
@@ -222,7 +222,7 @@ public interface OrderInfoService {
 
     R ratioConversion(List<String> orderInfoIds,String ratio,String xhfNsrsbh,String originUnit,String newUnit);
 
-    int updateBillNumber(String bzdh,String orderInfoId);
+    int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh);
 
     @Transactional
     R logicalDeleteByOrderInfoId(List<PageRequestVO> pageRequestList);
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 46adad4d..5ff39aaa 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
@@ -31,6 +31,7 @@ import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
 import com.dxhy.order.consumer.model.OderDetailInfo;
 import com.dxhy.order.consumer.model.PageOrderExt;
 import com.dxhy.order.consumer.model.page.PageRequestVO;
+import com.dxhy.order.consumer.modules.manager.service.InvoiceDataService;
 import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem;
 import com.dxhy.order.consumer.modules.order.model.PageKySlReq;
 import com.dxhy.order.consumer.modules.order.model.PageKySlRsp;
@@ -188,6 +189,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Resource
     private OrderMergeService orderMergeService;
 
+    @Resource
+    private InvoiceDataService invoiceDataService;
+
     DecimalFormat format = new DecimalFormat("#.###");
 
     @Override
@@ -1743,11 +1747,18 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     }
 
     @Override
-    public int updateBillNumber(String bzdh,String orderInfoId){
+    public int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh){
         OrderProcessInfo orderProcessInfo = new OrderProcessInfo();
         orderProcessInfo.setBzdh(bzdh);
         orderProcessInfo.setOrderInfoId(orderInfoId);
-        return orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo,null);
+        int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null);
+        if(i > 0) {
+            Map map = new HashMap();
+            map.put("ddqqlsh","");
+            map.put("xhfNsrsbh","");
+            invoiceDataService.manualPushInvoice(Arrays.asList(map));
+        }
+        return i;
     }
 
     @Override