From dd404aca7fe1544bafef90bbb3e05175712c02bc Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 28 Feb 2024 18:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/sap/controller/SapController.java  |  2 +-
 .../com/op/sap/service/SapOrderService.java   |  2 +-
 .../sap/service/impl/SapOrderServiceImpl.java | 28 +++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java
index 55651f56..aaf24302 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java
@@ -324,7 +324,7 @@ public class SapController extends BaseController {
 
     @PostMapping("/sapCreateOrder")
     @Log(title = "生产订单创建接口", businessType = BusinessType.SAP)
-    public R<List<Map<String, String>>> SapCreateOrder(@RequestBody List<SapCreateOrder> sapCreateOrderList) {
+    public R<List<String>> SapCreateOrder(@RequestBody List<SapCreateOrder> sapCreateOrderList) {
         return sapOrderService.SapCreateOrder(sapCreateOrderList);
     }
 
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java
index ff561e81..5c5d6083 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java
@@ -30,7 +30,7 @@ public interface SapOrderService {
      * @param sapCreateOrderList
      * @return
      */
-    R<List<Map<String, String>>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList);
+    R<List<String>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList);
 
     /**
      * 订单关闭
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..baba7318 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
@@ -24,10 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Component
@@ -161,7 +159,7 @@ public class SapOrderServiceImpl implements SapOrderService {
     }
 
     @Override
-    public R<List<Map<String, String>>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList) {
+    public R<List<String>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList) {
         String L_MSG=null;
         try {
             //获取连接
@@ -177,7 +175,7 @@ public class SapOrderServiceImpl implements SapOrderService {
             JCoParameterList jCoParameterList = func.getImportParameterList();
 
             if (sapCreateOrderList!=null && sapCreateOrderList.size()>0){
-                List<Map<String,String>> LV_ORDER_NUM_List=new ArrayList<>();
+                List<String> LV_ORDER_NUM_List=new ArrayList<>();
                 for (SapCreateOrder sapCreateOrder:sapCreateOrderList){
                     jCoParameterList.setValue("P_WERKS",sapCreateOrder.getWerks());
                     jCoParameterList.setValue("P_AUFPAR",sapCreateOrder.getAufpar());
@@ -191,18 +189,24 @@ public class SapOrderServiceImpl implements SapOrderService {
                     System.out.println(func.getExportParameterList());
                     L_MSG= func.getExportParameterList().getString("L_MSG");
                     JCoTable LT_ZGD=func.getTableParameterList().getTable("LT_ZGD");
+                    System.out.println(LT_ZGD);
+
                     for (int i = 0; i <LT_ZGD.getNumRows(); i++) {
                         LT_ZGD.setRow(i);
-                        Map map=new HashMap();
                         String LEAD_AUFNR = LT_ZGD.getString("LEAD_AUFNR");
                         String AUFNR = LT_ZGD.getString("AUFNR");
-                        map.put("LEAD_AUFNR",LEAD_AUFNR);
-                        map.put("AUFNR",AUFNR);
-                        LV_ORDER_NUM_List.add(map);
+                        LV_ORDER_NUM_List.add(LEAD_AUFNR);
+                        LV_ORDER_NUM_List.add(AUFNR);
                     }
+                    // 去重并排序（从大到小）
+
                 }
-                log.info("订单创建结果----"+L_MSG+"|"+JSONObject.toJSONString(LV_ORDER_NUM_List));
-                return R.ok(LV_ORDER_NUM_List,L_MSG);
+                List<String> uniqueAndSorted = LV_ORDER_NUM_List.stream()
+                        .distinct()
+                        .sorted((s1, s2) -> s2.compareTo(s1))
+                        .collect(Collectors.toList());
+                log.info("订单创建结果----"+L_MSG+"|"+JSONObject.toJSONString(uniqueAndSorted));
+                return R.ok(uniqueAndSorted,L_MSG);
             }else {
                 log.error("接收的数据为空");
                 return R.fail("接收的数据为空");