From 2ce35572f2ae91403365e49d97724c4b7e5669ed Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 27 Nov 2023 16:50:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8B=86=E5=88=86=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5sap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/system/api/RemoteSapService.java   |  4 ++++
 .../api/factory/RemoteSapFallbackFactory.java |  6 ++++++
 .../service/impl/ProOrderServiceImpl.java     | 15 +++++++++++++++
 .../impl/ProOrderWorkorderServiceImpl.java    | 19 +++++++++++++++++++
 4 files changed, 44 insertions(+)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java
index ab5b53b6..6b8d2a27 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java
@@ -24,6 +24,10 @@ public interface RemoteSapService {
     @PostMapping("/sap/shopOrderSync")
     public R<List<SapProOrder>> shopOrderSync(@RequestBody SapShopOrderQuery sapProOrder);
 
+    /**传递母订单号和母订单数量**/
+    @PostMapping("/sap/shopUpdateSync")
+    public R shopUpdateSync(@RequestBody SapShopOrderQuery sapProOrder);
+
     @PostMapping("/sap/sapRouterSync")
     public R<Boolean> sapRouterSync(@RequestBody SapRouterQuery sapRouterQuery);
 
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java
index a89735e0..fb002c67 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java
@@ -7,6 +7,7 @@ import com.op.system.api.model.SapProOrder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -73,6 +74,11 @@ public class RemoteSapFallbackFactory implements FallbackFactory<RemoteSapServic
                 return R.fail("sap bom同步失败" + throwable.getMessage());
             }
 
+            @Override
+            public R shopUpdateSync(SapShopOrderQuery sapProOrder) {
+                return R.fail("sap shopUpdateSync失败" + throwable.getMessage());
+            }
+
 
         };
     }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index 6b1a9733..9ed1c960 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.op.plan.service.impl;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -279,6 +280,20 @@ public class ProOrderServiceImpl implements IProOrderService {
                     if("0".equals(workOrder.getParentOrder())){
                         //20231127,加入belongWorkOrder概念
                         belongWorkOrder = workOrder.getWorkorderCode();
+
+                        //推送sap订单更新信息
+                        SapShopOrderQuery sapChange = new SapShopOrderQuery();
+                        sapChange.setAufnr(proOrder.getOrderCode());//母订单号
+                        BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity())
+                                .subtract(new BigDecimal(proOrder.getQuantitySplit()));
+                        sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量
+                        logger.info("母订单"+proOrder.getOrderCode()+
+                                "订单数量变更：修改前"+proOrder.getQuantity()+","+
+                                ",已拆数量"+proOrder.getQuantitySplit()+","+
+                                "给sap汇报数量"+newSapQuantityNum.toString());
+                        R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据
+                        logger.info("母订单"+proOrder.getOrderCode()+
+                                "订单数量变更结果："+rSapChange.getCode()+","+rSapChange.getMsg());
                     }
                     workOrder.setBelongWorkOrder(belongWorkOrder);
 
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 2a586e4c..8f5f4642 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -23,6 +23,7 @@ import com.op.system.api.domain.dto.MesPrepareDTO;
 import com.op.system.api.domain.dto.MesPrepareDetailDTO;
 import com.op.system.api.domain.sap.SapCreateOrder;
 import com.op.system.api.domain.sap.SapMaterialPreparation;
+import com.op.system.api.domain.sap.SapShopOrderQuery;
 import net.bytebuddy.matcher.FilterableList;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang.StringUtils;
@@ -36,6 +37,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -759,6 +761,23 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 Long conver = 1L;
                 int index = workOrderList.size();
                 while (run) {
+
+                    if(StringUtils.isBlank(proOrder.getParentOrder())){
+                        //推送sap订单更新信息
+                        SapShopOrderQuery sapChange = new SapShopOrderQuery();
+                        sapChange.setAufnr(proOrder.getOrderCode());//母订单号
+                        BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity())
+                                .subtract(new BigDecimal(proOrder.getAtrr1()));
+                        sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量
+                        logger.info("母订单"+proOrder.getOrderCode()+
+                                "订单数量变更：修改前"+proOrder.getQuantity()+","+
+                                "已拆数量"+proOrder.getAtrr1()+","+
+                                "给sap汇报数量"+newSapQuantityNum.toString());
+                        R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据
+                        logger.info("母订单"+proOrder.getOrderCode()+
+                                "订单数量变更结果："+rSapChange.getCode()+","+rSapChange.getMsg());
+                    }
+
                     // 获得对应工单
                     ProOrderWorkorder proOrderWorkorder = workOrderList.get(--index);
                     // 更新订单