修改

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -2574,7 +2574,37 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
 
     @Override
     public List<Map<String, Object>> getKucunList(Map<String, Object> map) {
-        return amsSaleOrderMapper.getKucunList(map);
+        HashSet<Map<String,Object>> filterConsigneeList = new HashSet<>();
+        HashSet<Map<String,Object>> filterToStationList = new LinkedHashSet<>();
+        HashSet<Map<String,Object>> filtermaterialNameList = new LinkedHashSet<>();
+        HashSet<Map<String,Object>> filtermaterialSpaList = new LinkedHashSet<>();
+        List<Map<String,Object>> mapList = amsSaleOrderMapper.getKucunList(map);
+        for(int j = 0;j < mapList.size() ; j++ ) {
+            Map<String,Object> stringObjectMap = mapList.get(j);
+            Map<String,Object> filterConsigneeMap = new HashMap<>();
+            filterConsigneeMap.put("text",stringObjectMap.get("receiveName"));
+            filterConsigneeMap.put("value",stringObjectMap.get("receiveName"));
+            filterConsigneeList.add(filterConsigneeMap);
+            Map<String,Object> filterToStationMap = new HashMap<>();
+            filterToStationMap.put("text",stringObjectMap.get("toTheStation"));
+            filterToStationMap.put("value",stringObjectMap.get("toTheStation"));
+            filterToStationList.add(filterToStationMap);
+            Map<String,Object> filtermaterialNameMap = new HashMap<>();
+            filtermaterialNameMap.put("text",stringObjectMap.get("materialName"));
+            filtermaterialNameMap.put("value",stringObjectMap.get("materialName"));
+            filtermaterialNameList.add(filtermaterialNameMap);
+            Map<String,Object> filtermaterialSpaMap = new HashMap<>();
+            filtermaterialSpaMap.put("text",stringObjectMap.get("materialSpa"));
+            filtermaterialSpaMap.put("value",stringObjectMap.get("materialSpa"));
+            filtermaterialSpaList.add(filtermaterialSpaMap);
+        }
+        if(mapList.size() > 0) {
+            mapList.get(0).put("filterConsigneeList",filterConsigneeList);
+            mapList.get(0).put("filterToStationList",filterToStationList);
+            mapList.get(0).put("filtermaterialNameList",filtermaterialNameList);
+            mapList.get(0).put("filtermaterialSpaList",filtermaterialSpaList);
+        }
+        return mapList;
     }
 
     //反关闭

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -4721,7 +4721,18 @@
                         ASM.EAS_PRIMARY_ID                                      "flId",
                         TPAR.RESULT_ID                                          "approveId",
                         TPAR.UPDATE_USERNAME                                    "sendStationOptionName",
-                        ASO.UPDATE_USERNAME                                     "consigneeOptionName"
+                        ASO.UPDATE_USERNAME                                     "consigneeOptionName",
+                        (CASE
+                            WHEN ASO.DELETED IN (1,2)
+                            THEN '关闭'
+                            ELSE '正常'
+                            END) "saleOrderStatus",
+                        (CASE WHEN
+                            TWR.RESULT_NET_WEIGHT IS NOT NULL
+                            THEN '已出库'
+                            ELSE
+                            '未出库'
+                            END) "netWeightStatus"
                       FROM AMS_SALE_ORDER ASO
                         LEFT JOIN AMS_SALE_MATERIAL ASM
                       ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4741,6 +4752,8 @@
                         ON RDOOUTDEP.ORG_CODE = ASO.TRANSFER_OUT_DEP
                         LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF
                         ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
+                        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                        ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
                       WHERE ASO.SALE_TYPE = 4
                         and asm.DELETED is null
                         and asm.SALE_ORDER_ID != -1