From c6c68f01fc794529fcdf6c99ea0d5a00ca59e126 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 6 Jun 2023 14:29:29 +0800 Subject: [PATCH] =?UTF-8?q?task4516=20sap=E6=8A=A5=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInvoiceController.java | 11 ++++++----- .../modules/order/service/OrderProcessService.java | 6 ++++++ .../order/service/impl/OrderProcessServiceImpl.java | 11 ++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java index 66496516..d2dee122 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java @@ -459,11 +459,12 @@ public class OrderInvoiceController { orderProcessInfo1.setFpqqlsh(baseService.getGenerateShotKey()); orderProcessInfo1.setXtly(orderProcessInfo.getXtly()); } - int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList); - if (success < 0) { - errorMsgList.append(preStr).append("数据删除失败").append("\r\n"); - continue; - } +// int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList); + orderProcessService.deleteOrderProcessInfoAndOrderInfoByProcessId(orderProcessInfo1, shList); +// if (success < 0) { +// errorMsgList.append(preStr).append("数据删除失败").append("\r\n"); +// continue; +// } //如果是红票数据,并且是专票,需要更新红字信息表数据 // 红字专票 作废后修改申请单的状态为未开票 if (OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(orderProcessInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderProcessInfo.getFpzlDm())) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java index 749653e1..3beb8826 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java @@ -78,6 +78,12 @@ public interface OrderProcessService { */ int updateOrderProcessInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList); + /** + * 删除开票申请单 + * @param orderProcessInfo + */ + void deleteOrderProcessInfoAndOrderInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList); + /** * 根据销方税号,订单号,发票请求流水号进行查询orderprocess信息 * diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java index ab5bd880..c7b974ea 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java @@ -131,7 +131,12 @@ public class OrderProcessServiceImpl implements OrderProcessService { @Override public int updateOrderProcessInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList) { - if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())) { + return orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList); + } + + @Override + public void deleteOrderProcessInfoAndOrderInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList) { + if (StringUtils.isNotBlank(orderProcessInfo.getXtly())&&OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())) { OrderInfo orderInfo = orderInfoMapper.queryOrderInfoByProcessId(orderProcessInfo.getId()); if (orderInfo == null) { throw new RuntimeException("删除SAP推送单据,数据异常"); @@ -142,9 +147,9 @@ public class OrderProcessServiceImpl implements OrderProcessService { throw new RuntimeException("删除SAP推送单据,数据异常"); } } - return orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList); + orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList); } - + /** * 根据销方税号,订单号,发票请求流水号进行查询orderprocess信息 *