采购拆单订单发起排序调整

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/purchaseServiceImpl.java

@@ -230,8 +230,8 @@ public class purchaseServiceImpl implements PurchaseService {
 //                .formUuid("FORM-A8064C8333E24DEA88618D018DE0AE84WJPQ")
 //                .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_ltxstp81, selectField_mgswtsqu",UtilMap.getList(formData,"cascadeDateField_miybkcsm"),"是")))
 //                .build());
-        //过滤参与批量发起为否的数据
-        dataList = dataList.stream().filter(map -> "是".equals(map.get("selectField_mgswtsqu")) && UtilMap.getInt(map,"numberField_ltxyjf0s") > 0).collect(Collectors.toList());
+        //过滤参与批量发起为否、可采购数量大于0、非临时采购的数据
+        dataList = dataList.stream().filter(map -> !"临时采购".equals(map.get("textField_ludp2v7i")) && UtilMap.getInt(map,"numberField_ltxyjf0s") > 0).collect(Collectors.toList());
 
         //分组求和
         Map<Object, Long> groupCountMap = dataList.stream()
@@ -316,7 +316,7 @@ public class purchaseServiceImpl implements PurchaseService {
                     try {
                         final int[] totalCount = {0};
                         final double[] amountSum = {0.0};
-                    List<String> v1 = (List<String>) v;
+//                    List<String> v1 = (List<String>) v;
 //                    if (v1.size()>=3){
                         //供应商数据
                         String[] split = k.toString().split("-");
@@ -342,6 +342,13 @@ public class purchaseServiceImpl implements PurchaseService {
                                 successCount[0]++;
                             });
                         }
+                        List<Map<String, Object>> sortedByName = tableList.stream()
+                                .sorted((m1, m2) -> {
+                                    String name1 = UtilMap.getString(m1,"textField_lu22o9f0");
+                                    String name2 = UtilMap.getString(m2,"textField_lu22o9f0");
+                                    return name1.compareTo(name2);
+                                })
+                                .collect(Collectors.toList());
                         /*发起流程*/
                         ydClient.operateData(YDParam.builder()
                                 .appType("APP_ERBDTFS82HOVBPL3NFH0")
@@ -351,7 +358,7 @@ public class purchaseServiceImpl implements PurchaseService {
                                                 "textField_lr26l3hf, associationFormField_lr26l3he, textField_lwg62y7o, numberField_lr26l3hq, numberField_lr26l3hr, tableField_ltxug6h1, " +
                                                 "employeeField_lvz29gxt, textField_lvvs6x8v, textField_lw7sg8hq, textField_lw8we1wc, departmentSelectField_lxe98xep, employeeField_lr26l3h0, " +
                                                 "textField_luhs0cni",
-                                        cbzz[1], cbzz[0], "物耗/配件", gys[0], gysAss, UtilMap.getString(gysList.get(0),"textField_lrhgjspc"), totalCount[0], amountSum[0], tableList,
+                                        cbzz[1], cbzz[0], "物耗/配件", gys[0], gysAss, UtilMap.getString(gysList.get(0),"textField_lrhgjspc"), totalCount[0], amountSum[0], sortedByName,
                                         UtilMap.getString(gysList.get(0),"employeeField_lvz29gxt_id"), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")),
                                         LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy")), UtilMap.getString(formData,"departmentSelectField_mjchgs8l_id"), UtilMap.getString(formData,"employeeField_mhdgj164_id"),
                                         UtilMap.getString(formData,"textField_mjchgs8n"))))