From 8d82a45e05562700b01ec1c1a617ba641a122f7a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 28 Feb 2024 10:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=B1=82=E8=AE=A2=E5=8D=95=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/domain/sap/SapCloseOrderQuery.java    | 11 +++++++
 .../sap/service/impl/SapOrderServiceImpl.java | 32 ++++++++-----------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java
index 11066d7b..eae142ac 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java
@@ -1,9 +1,20 @@
 package com.op.system.api.domain.sap;
 
 
+import java.util.List;
+
 public class SapCloseOrderQuery {
     private String leadOrder;
     private String order;
+    private List<String> orderCodes;
+
+    public List<String> getOrderCodes() {
+        return orderCodes;
+    }
+
+    public void setOrderCodes(List<String> orderCodes) {
+        this.orderCodes = orderCodes;
+    }
 
     public String getLeadOrder() {
         return leadOrder;
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
index b407fbdb..4feec40d 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -230,25 +231,18 @@ public class SapOrderServiceImpl implements SapOrderService {
 
             // 配置传入参数
             JCoParameterList jCoParameterList = func.getImportParameterList();
-            if (StringUtils.isEmpty(sapCloseOrderQuery.getLeadOrder())){
-                return R.fail("母订单号为空");
-            }
-            if (StringUtils.isEmpty(sapCloseOrderQuery.getOrder())){
-                return R.fail("子订单号为空");
-            }
-            //关闭母订单
-             jCoParameterList.setValue("P_AUFNR",sapCloseOrderQuery.getLeadOrder());
-             func.execute(dest);//执行调用函数
-//             JCoParameterList J= func.getExportParameterList();
-//             System.out.println(J);
-             String L_MSG1= func.getExportParameterList().getString("L_MSG");
-             Msg.append(sapCloseOrderQuery.getLeadOrder()+L_MSG1+";");
-
-             //关闭子订单
-            jCoParameterList.setValue("P_AUFNR",sapCloseOrderQuery.getOrder());
-            func.execute(dest);//执行调用函数
-            String L_MSG2= func.getExportParameterList().getString("L_MSG");
-            Msg.append(sapCloseOrderQuery.getOrder()+L_MSG2);
+            if (CollectionUtils.isEmpty(sapCloseOrderQuery.getOrderCodes())){
+                return R.fail("订单集合为空");
+            }
+
+            //关闭订单
+             for(String orderCode:sapCloseOrderQuery.getOrderCodes()){
+                jCoParameterList.setValue("P_AUFNR",orderCode);
+                func.execute(dest);//执行调用函数
+                String L_MSG1= func.getExportParameterList().getString("L_MSG");
+                Msg.append(orderCode+"-"+L_MSG1+";");
+             }
+
             log.info("订单关闭结果"+Msg.toString());
             return R.ok(null,Msg.toString());
         }catch (Exception e){