diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/MapOf.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/MapOf.java index 7107bc7..1dfb6aa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/MapOf.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/MapOf.java @@ -3,6 +3,7 @@ package org.nl.common.utils; import java.io.Serializable; import java.util.HashMap; +import java.util.LinkedHashMap; /* * @author ZZQ @@ -17,4 +18,13 @@ public class MapOf implements Serializable { } return map; } + + // 新增:LinkedHashMap 版本,和上面逻辑完全一致 + public static LinkedHashMap ofLinked(K... key) { + LinkedHashMap map = new LinkedHashMap(); + for (int i = 0; i < (key.length & ~1); i = i + 2) { + map.put(key[i], key[i + 1]); + } + return map; + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructIvtController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructIvtController.java index 5496874..9895f6f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructIvtController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructIvtController.java @@ -68,10 +68,14 @@ public class StructIvtController { } }).collect(Collectors.toList()); try { - columnInfoService.exportFile("md_pb_groupplate", maps, response, - null, MapOf.of( - "material_code","物料编号","material_name","物料名称","sect_name","库区名称" - ,"stor_name","仓库名称","struct_name","仓位名称","struct_code","仓位编码" + columnInfoService.exportFile(null, maps, response, + null, MapOf.ofLinked( + "stor_name","仓库名称","sect_name","库区名称", + "struct_code","仓位编码","struct_name","仓位名称", + "material_code","物料编号","material_name","物料名称", + "qty","组盘数量","frozen_qty","冻结数量", + "storagevehicle_code","载具编码","qty_unit_name","计量单位名称" + ,"create_time","组盘时间","update_time","修改时间" ) ); } catch (IOException e) {