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>> SapCreateOrder(@RequestBody List sapCreateOrderList) { + public R> SapCreateOrder(@RequestBody List 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>> SapCreateOrder(List sapCreateOrderList); + R> SapCreateOrder(List 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>> SapCreateOrder(List sapCreateOrderList) { + public R> SapCreateOrder(List 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> LV_ORDER_NUM_List=new ArrayList<>(); + List 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 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("接收的数据为空");