优化导出,优化导入不分层垛位层号为1

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -5,14 +5,19 @@ import com.th.demo.model.system.Type;
 import com.th.demo.model.ware.Store;
 import com.th.demo.service.maint.CustomerService;
 import com.th.demo.service.ware.StoreService;
+import com.th.demo.tools.DateTools;
+import com.th.demo.tools.ExportExcelTools;
 import com.th.demo.tools.JSONTools;
+import com.th.demo.tools.Tools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/WareStore")
@@ -21,7 +26,6 @@ public class StoreController {
     public StoreService storeService;
     String result = Type.FAIL;
 
-
     @RequestMapping(value = "/query.do")//查询方法 前两个参数是分页参数
     public String query(
             int page,
@@ -220,4 +224,395 @@ public class StoreController {
             return result;
         }
     }
+
+    /**
+     * 导出入库记录Excel - 分批查询流式导出，解决大数据量内存溢出问题
+     */
+    @RequestMapping(value = "/inExportStoreExcel.do")
+    public void inExportStoreExcel(
+            int page, int rows,
+            String wareName,
+            String stackName,
+            String model,
+            String materialName,
+            String standard,
+            String customerName,
+            String plateNo,
+            String fromDate,
+            String toDate,
+            String ordNo,
+            String carNo,
+            String tallyPeople,
+            String fkComponyName,
+            String remark1,
+            String contractNo,
+            String userId,
+            String belongId,
+            HttpServletRequest request,
+            HttpServletResponse response) {
+        try {
+
+            Date fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
+            Date toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
+
+            // 设置表头
+            String[] headers = {"仓库名称"
+                    ,"垛位"
+                    ,"层号"
+                    ,"品名"
+                    ,"订单号"
+                    ,"规格"
+                    ,"钢种"
+                    ,"入库数量"
+                    ,"入库重量"
+                    ,"钢板号"
+                    ,"订货单位"
+                    ,"客户单位"
+                    ,"收货地址"
+                    ,"计量方式"
+                    ,"切边类型"
+                    ,"产地"
+                    ,"入库车号"
+                    ,"入库理货人员"
+                    ,"入库操作人"
+                    ,"入库时间"
+                    ,"垛位备注"
+                    ,"类型"
+                    ,"备注"
+                    ,"合约号"};
+
+            // 设置字段名
+            String[] columns = {"wareName"
+                    ,"stackName"
+                    ,"layer"
+                    ,"materialName"
+                    ,"ordNo"
+                    ,"model"
+                    ,"standard"
+                    ,"count"
+                    ,"weight"
+                    ,"plateNo"
+                    ,"customerName"
+                    ,"fkComponyName"
+                    ,"receiveAddress"
+                    ,"wgtDcnMtcCd"
+                    ,"edgeTy"
+                    ,"productionPlace"
+                    ,"carNo"
+                    ,"tallyPeople"
+                    ,"addUserUserDesc"
+                    ,"addTime"
+                    ,"remark1"
+                    ,"recordType"
+                    ,"remark"
+                    ,"contractNo"};
+
+            // 设置列宽
+            int[] arrWidth = {
+                    50, 30, 50, 50, 50, 50, 50,
+                    30, 30, 50, 50, 80, 40, 40,
+                    50, 50, 60, 50, 50, 50,
+                    30, 30, 40, 40
+            };
+
+            // 生成文件名
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String filename = "入库库记录_" + sdf.format(new Date()) + ".xlsx";
+
+            // 分批查询，每批5000条
+            final int batchSize = 5000;
+            int offset = 0;
+
+            // 使用try-with-resources自动关闭流
+            try (OutputStream out = Tools.getExportOutStream(filename, response)) {
+                // 创建流式工作簿
+                ExportExcelTools<List<Map<String, Object>>> exportExcel = new ExportExcelTools<>();
+                
+                // 写入表头
+                exportExcel.writeHeaders("入库记录", headers, columns, arrWidth, out, "yyyy/MM/dd HH:mm:ss");
+                
+                // 分批查询并写入
+                while (true) {
+                    List<Map<String, Object>> batchData = storeService.exportStoreExcelBatch(
+                            page, rows, wareName, stackName, model, materialName, standard, customerName,
+                            plateNo, fromDate2, toDate2, userId, belongId, ordNo, carNo, tallyPeople, 
+                            fkComponyName, remark1, contractNo, offset, batchSize);
+                    
+                    if (batchData == null || batchData.isEmpty()) {
+                        break;
+                    }
+                    
+                    // 写入数据
+                    exportExcel.appendData(columns, batchData, "yyyy/MM/dd HH:mm:ss");
+                    
+                    // 如果数据少于批次大小，说明是最后一批
+                    if (batchData.size() < batchSize) {
+                        break;
+                    }
+                    
+                    offset += batchSize;
+                    
+                    // 手动触发GC回收内存
+                    System.gc();
+                }
+                
+                // 完成写入
+                exportExcel.finishWrite(out);
+                out.flush();
+            } catch (Exception e) {
+                e.printStackTrace();
+                response.reset();
+                response.setContentType("text/html;charset=utf-8");
+                response.getWriter().write("导出失败：" + e.getMessage());
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 导出出库记录Excel - 分批查询流式导出，解决大数据量内存溢出问题
+     */
+    @RequestMapping(value = "/outExportStoreExcel.do")
+    public void outExportStoreExcel(
+            int page,int rows,  String wareName,
+            String stackName,
+            String model,
+            String materialName,
+            String standard,
+            String customerName,
+            String plateNo,
+            String pFromDate,
+            String pToDate,
+            String carNo,
+            String tallyPeople,
+            String ordNo,
+            String fkComponyName,
+            String remark1,
+            String contractNo,
+            String userId,
+            String belongId,
+            HttpServletRequest request,
+            HttpServletResponse response) {
+        try {
+            // 设置超时时间，单位毫秒（10分钟）
+            response.setHeader("timeout", "600000");
+
+            Date fromDate = DateTools.StrToDate(pFromDate, "yyyy-MM-dd HH:mm:ss");
+            Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
+
+            // 设置表头
+            String[] headers = {"仓库名称"
+                    ,"垛位"
+                    ,"层号"
+                    ,"品名"
+                    ,"订单号"
+                    ,"入库人"
+                    ,"入库车号"
+                    ,"入库时间"
+                    ,"规格"
+                    ,"钢种"
+                    ,"出库数量"
+                    ,"出库重量"
+                    ,"钢板号"
+                    ,"订单客户"
+                    ,"客户单位"
+                    ,"收货地址"
+                    ,"计量方式"
+                    ,"切边类型"
+                    ,"产地"
+                    ,"出库车号"
+                    ,"出库理货人员"
+                    ,"出库操作人"
+                    ,"出库时间"
+                    ,"备注"
+                    ,"垛位备注"
+                    ,"类型"
+                    ,"合约号"};
+
+            // 设置字段名
+            String[] columns = {"wareName"
+                    ,"stackName"
+                    ,"layer"
+                    ,"materialName"
+                    ,"ordNo"
+                    ,"inUser"
+                    ,"inCarNo"
+                    ,"inTime"
+                    ,"model"
+                    ,"standard"
+                    ,"count"
+                    ,"weight"
+                    ,"plateNo"
+                    ,"customerName"
+                    ,"fkComponyName"
+                    ,"receiveAddress"
+                    ,"wgtDcnMtcCd"
+                    ,"edgeTy"
+                    ,"productionPlace"
+                    ,"outCarNo"
+                    ,"tallyPeople"
+                    ,"addId"
+                    ,"addTime"
+                    ,"remark"
+                    ,"remark1"
+                    ,"recordType"
+                    ,"contractNo"};
+
+            // 设置列宽
+            int[] arrWidth = {
+                    50, 30, 50, 50, 50, 50, 50,
+                    30, 30, 50, 50, 80, 40, 40,
+                    50, 50, 60, 50, 50, 50,
+                    50, 50, 50, 50, 50, 50, 50
+            };
+
+            // 生成文件名
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String filename = "出库记录_" + sdf.format(new Date()) + ".xlsx";
+
+            // 分批查询，每批5000条
+            final int batchSize = 5000;
+            int offset = 0;
+
+            // 使用try-with-resources自动关闭流
+            try (OutputStream out = Tools.getExportOutStream(filename, response)) {
+                // 创建流式工作簿
+                ExportExcelTools<List<Map<String, Object>>> exportExcel = new ExportExcelTools<>();
+
+                // 写入表头
+                exportExcel.writeHeaders("出库记录", headers, columns, arrWidth, out, "yyyy/MM/dd HH:mm:ss");
+
+                // 分批查询并写入
+                while (true) {
+                    List<Map<String, Object>> batchData = storeService.outExportStoreExcelBatch(
+                            page, rows, wareName, stackName, model, materialName, standard, customerName,
+                            plateNo, carNo, tallyPeople, ordNo, fkComponyName, remark1, contractNo, fromDate, toDate, userId, belongId,
+                            offset, batchSize);
+
+                    if (batchData == null || batchData.isEmpty()) {
+                        break;
+                    }
+
+                    // 写入数据
+                    exportExcel.appendData(columns, batchData, "yyyy/MM/dd HH:mm:ss");
+
+                    // 如果数据少于批次大小，说明是最后一批
+                    if (batchData.size() < batchSize) {
+                        break;
+                    }
+
+                    offset += batchSize;
+
+                    // 手动触发GC回收内存
+                    System.gc();
+                }
+
+                // 完成写入
+                exportExcel.finishWrite(out);
+                out.flush();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 导库存Excel - 使用StoreMapper查询，分批流式导出
+     */
+    @RequestMapping(value = "/exportStoreExcel.do")
+    public void exportStoreExcel(
+            int page, int rows,
+            String wareName,
+            String stackName,
+            String model,
+            String materialName,
+            String standard,
+            String customerName,
+            String plateNo,
+            String ordNo,
+            String remark1,
+            String fkcustmerName,
+            String userId,
+            String belongId,
+            HttpServletRequest request,
+            HttpServletResponse response) {
+        try {
+            // 设置超时时间，单位毫秒（10分钟）
+            response.setHeader("timeout", "600000");
+
+            // 获取导出数据
+            List<Map<String, Object>> dataList = storeService.exportStoreForExcel(
+                    wareName, stackName, model, materialName, standard, customerName,
+                    plateNo, ordNo, remark1, fkcustmerName, userId, belongId, 0, -1);
+
+            // 设置表头
+            String[] headers = {"层数"
+                    ,"垛位"
+                    ,"货物品名"
+                    ,"材质"
+                    ,"钢板号"
+                    ,"规格型号"
+                    ,"数量"
+                    ,"重量"
+                    ,"订单号"
+                    ,"合约号"
+                    ,"订单客户"
+                    ,"客户名称"
+                    ,"收货地址"
+                    ,"产地"
+                    ,"备注"
+                    ,"垛位备注"
+                    ,"入库时间"
+                    ,"入库车号"};
+
+            // 设置字段名
+            String[] columns = {"layer"
+                    ,"stackName"
+                    ,"materialName"
+                    ,"materialStandard"
+                    ,"plateNo"
+                    ,"model"
+                    ,"count"
+                    ,"weight"
+                    ,"ordNo"
+                    ,"contractNo"
+                    ,"customerName"
+                    ,"fkComponyName"
+                    ,"receiveAddress"
+                    ,"productionPlace"
+                    ,"remark"
+                    ,"remark1"
+                    ,"addTime"
+                    ,"carNo"};
+
+            // 设置列宽
+            int[] arrWidth = {
+                    30, 30, 50, 50, 50, 50,
+                    30, 30, 50, 50, 50, 50,
+                    80, 50, 50, 50, 50, 50
+            };
+
+            // 生成文件名
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String filename = "库存记录_" + sdf.format(new Date()) + ".xlsx";
+
+            // 使用try-with-resources自动关闭流
+            try (OutputStream out = Tools.getExportOutStream(filename, response)) {
+                ExportExcelTools<List<Map<String, Object>>> exportExcel = new ExportExcelTools<>();
+                // 导出Excel
+                exportExcel.exportXSExcelByColumn("库存记录", headers, columns, arrWidth, dataList, out, "yyyy/MM/dd HH:mm:ss");
+                out.flush(); // 强制刷缓冲区
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

src/main/java/com/th/demo/mapping/ware/InRecordMapper.java

@@ -27,6 +27,13 @@ public interface InRecordMapper {
                           Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName
                             ,List<String> plateNos,List<String> ordNos,String remark1,String contractNo,List<String> contractNos);
 
+    //分页查询导出数据（不含关联用户信息，减少内存占用）
+    List<InRecord> selectForExport(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
+                          String plateNo, Date fromDate,
+                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName
+                            ,List<String> plateNos,List<String> ordNos,String remark1,String contractNo,List<String> contractNos,
+                            int offset, int limit);
+
     int updateIn(InRecord inRecord);
 
     List<TrackRecord> selectTrackRecord(String plateNo, String userId, String belongId);

src/main/java/com/th/demo/mapping/ware/OutRecordMapper.java

@@ -27,6 +27,12 @@ public interface OutRecordMapper {
                                 String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
                                 String ordNo, String fkComponyName, List<String> plateNos, List<String> ordNos, String remark1,String contractNo,List<String> contractNos);
 
+    //分页查询导出（不含关联用户信息，减少内存占用）
+    List<OutRecord> selectForExport(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
+                                String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
+                                String ordNo, String fkComponyName, List<String> plateNos, List<String> ordNos, String remark1, String contractNo, List<String> contractNos,
+                                int offset, int limit);
+
     List<TotalRecord>  selectTotal(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                                    String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
                                    String tallyPeople, String ordNo, String fkComponyName,List<String> plateNos,List<String> ordNos,String remark1);

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -76,4 +76,12 @@ public interface StoreMapper {
      * 根据垛位id查询当前垛位下是否存在未出库钢板
      */
     List<String> queryStoreById(@Param("stackId") String stackId);
+
+    /**
+     * 库存导出查询（支持分页偏移，直接返回Map）
+     */
+    List<Map<String, Object>> selectStoreForExport(String wareName, String stackName, String model, String materialName, String standard,
+                            String customerName, String plateNo, String orderNo, List<String> plateNos, List<String> ordNos,
+                            String userId, String belongId, String remark1, String fkcustmerName,
+                            int offset, int limit);
 }

src/main/java/com/th/demo/service/impl/ware/InServiceImpl.java

@@ -228,7 +228,7 @@ public class InServiceImpl implements InService {
             if (stack.getIsLayer().equals("1")) {
                 listSameStack.get(m).setLayer(currentLayer + m + 1);
             } else {
-                listSameStack.get(m).setLayer(0);
+                listSameStack.get(m).setLayer(1);
             }
             listSameStack.get(m).setAddId(userId);
             listSameStack.get(m).setAddTime(new Date());

src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java

@@ -6,17 +6,12 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.CustomerMapper;
 import com.th.demo.mapping.maint.StackMapper;
-import com.th.demo.mapping.ware.ChangeRecordMapper;
-import com.th.demo.mapping.ware.MoveRecordMapper;
-import com.th.demo.mapping.ware.StoreMapper;
+import com.th.demo.mapping.ware.*;
 import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Stack;
 import com.th.demo.model.system.SysUser;
 import com.th.demo.model.system.Type;
-import com.th.demo.model.ware.ChangeRecord;
-import com.th.demo.model.ware.MoveRecord;
-import com.th.demo.model.ware.SplitRecord;
-import com.th.demo.model.ware.Store;
+import com.th.demo.model.ware.*;
 import com.th.demo.service.maint.CustomerService;
 import com.th.demo.service.ware.MoveService;
 import com.th.demo.service.ware.StoreService;
@@ -26,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service("StoreService")
 public class StoreServiceImpl implements StoreService {
@@ -44,6 +36,10 @@ public class StoreServiceImpl implements StoreService {
     public MoveRecordMapper moveRecordMapper;
     @Autowired//自动注入Mapper
     public CustomerMapper customerMapper;
+    @Autowired
+    public InRecordMapper inRecordMapper;
+    @Autowired
+    public OutRecordMapper outRecordMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -386,5 +382,298 @@ public class StoreServiceImpl implements StoreService {
 //        修改入库表收货地址
         int i1 = storeMapper.updateInAddressById(inId, newCustomerAddress);
         return result;
+      }
+
+    /**
+     * 导出库存Excel
+     */
+    @Override
+    public List<Map<String, Object>> exportStoreExcel(int page, int rows,
+                                                     String wareName, String stackName, String model, String materialName, String standard, String customerName,
+                                                     String plateNo, Date fromDate, Date toDate, String userId, String belongId,
+                                                     String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1,String contractNo) {
+
+        // 调用分批查询方法
+        return exportStoreExcelBatch(page, rows, wareName, stackName, model, materialName, standard, customerName,
+                plateNo, fromDate, toDate, userId, belongId, ordNo, carNo, tallyPeople, fkComponyName, remark1, contractNo, 0, -1);
+    }
+
+    /**
+     * 分批导出库存Excel（解决大数据量内存溢出问题）
+     */
+    @Override
+    public List<Map<String, Object>> exportStoreExcelBatch(int page, int rows,
+                                                     String wareName, String stackName, String model, String materialName, String standard, String customerName,
+                                                     String plateNo, Date fromDate, Date toDate, String userId, String belongId,
+                                                     String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1,String contractNo,
+                                                     int offset, int limit) {
+
+        // ========== 1. 所有字符串入参统一把 null 转为空串 ==========
+        wareName = wareName == null ? "" : wareName;
+        stackName = stackName == null ? "" : stackName;
+        model = model == null ? "" : model;
+        materialName = materialName == null ? "" : materialName;
+        standard = standard == null ? "" : standard;
+        customerName = customerName == null ? "" : customerName;
+        plateNo = plateNo == null ? "" : plateNo;
+        userId = userId == null ? "" : userId;
+        belongId = belongId == null ? "" : belongId;
+        ordNo = ordNo == null ? "" : ordNo;
+        carNo = carNo == null ? "" : carNo;
+        tallyPeople = tallyPeople == null ? "" : tallyPeople;
+        fkComponyName = fkComponyName == null ? "" : fkComponyName;
+        remark1 = remark1 == null ? "" : remark1;
+        contractNo = contractNo == null ? "" : contractNo;
+
+        List<String> pltNos = new ArrayList<>();
+        List<String> ordNos = new ArrayList<>();
+        List<String> contractNos =new ArrayList<>() ;
+
+        // 现在plateNo一定不为null，直接判断逗号
+        if (plateNo.contains(",")) {
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (contractNo.contains(",")){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+        if (ordNo.contains(",")) {
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+
+        List<InRecord> storeList;
+        // 如果 limit <= 0，使用原来的全量查询
+        if (limit <= 0) {
+            storeList = inRecordMapper.select(
+                    wareName, stackName, model, materialName, standard, customerName,
+                    plateNo, fromDate, toDate, userId, belongId, ordNo, carNo,
+                    tallyPeople, fkComponyName, pltNos, ordNos, remark1, contractNo, contractNos);
+        } else {
+            // 分批查询
+            storeList = inRecordMapper.selectForExport(
+                    wareName, stackName, model, materialName, standard, customerName,
+                    plateNo, fromDate, toDate, userId, belongId, ordNo, carNo,
+                    tallyPeople, fkComponyName, pltNos, ordNos, remark1, contractNo, contractNos,
+                    limit, offset);
+        }
+
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        for (InRecord store : storeList) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            // 仓库名称
+            map.put("wareName", store.getWareName() != null ? store.getWareName() : "");
+            // 垛位
+            map.put("stackName", store.getStackName() != null ? store.getStackName() : "");
+            // 层号
+            map.put("layer", store.getLayer() != null ? store.getLayer() : "");
+            // 品名
+            map.put("materialName", store.getMaterialName() != null ? store.getMaterialName() : "");
+            // 订单号
+            map.put("ordNo", store.getOrdNo() != null ? store.getOrdNo() : "");
+            // 规格型号
+            map.put("model", store.getModel() != null ? store.getModel() : "");
+            // 钢种
+            map.put("standard", store.getStandard() != null ? store.getStandard() : "");
+            // 数量
+            map.put("count", store.getCount() != null ? store.getCount() : "");
+            // 重量
+            map.put("weight", store.getWeight() != null ? store.getWeight() : "");
+            // 钢板号
+            map.put("plateNo", store.getPlateNo() != null ? store.getPlateNo() : "");
+            // 客户
+            map.put("customerName", store.getCustomerName() != null ? store.getCustomerName() : "");
+            // 货权单位
+            map.put("fkComponyName", store.getFkComponyName() != null ? store.getFkComponyName() : "");
+            // 收货地址
+            map.put("receiveAddress", store.getReceiveAddress() != null ? store.getReceiveAddress() : "");
+            // 计量方式
+            map.put("wgtDcnMtcCd", store.getWgtDcnMtcCd() != null ? store.getWgtDcnMtcCd() : "");
+            // 切边类型
+            map.put("edgeTy", store.getEdgeTy() != null ? store.getEdgeTy() : "");
+            // 产地
+            map.put("productionPlace", store.getProductionPlace() != null ? store.getProductionPlace() : "");
+            // 入库车号
+            map.put("carNo", store.getCarNo() != null ? store.getCarNo() : "");
+            // 入库理货人员
+            map.put("tallyPeople", store.getTallyPeople() != null ? store.getTallyPeople() : "");
+
+            // ========== 修复空指针核心：addUser判空 ==========
+            String addUserDesc = "";
+            if(store.getAddUser() != null){
+                addUserDesc = store.getAddUser().getUserDesc() != null ? store.getAddUser().getUserDesc() : "";
+            }
+            map.put("addUserUserDesc", addUserDesc);
+
+            // 入库时间
+            map.put("addTime", store.getAddTime() != null ? store.getAddTime() : "");
+            // 垛位备注
+            map.put("remark1", store.getRemark1() != null ? store.getRemark1() : "");
+            // 类型
+            map.put("recordType", store.getRecordType() != null ? store.getRecordType() : "");
+            // 备注
+            map.put("remark", store.getRemark() != null ? store.getRemark() : "");
+            // 合约号
+            map.put("contractNo", store.getContractNo() != null ? store.getContractNo() : "");
+
+            resultList.add(map);
+        }
+        return resultList;
+    }
+
+    /**
+     * 导出出库Excel
+     */
+    public List<Map<String, Object>> outExportStoreExcel(int page, int rows,
+                                                         String wareName, String stackName, String model, String materialName, String standard,
+                                                         String customerName, String plateNo, String carNo, String tallyPeople, String ordNo,
+                                                         String fkComponyName, String remark1, String contractNo, Date fromDate, Date toDate, String userId, String belongId) {
+        // 调用分批查询方法
+        return outExportStoreExcelBatch(page, rows, wareName, stackName, model, materialName, standard,
+                customerName, plateNo, carNo, tallyPeople, ordNo, fkComponyName, remark1, contractNo, fromDate, toDate, userId, belongId, 0, -1);
+    }
+
+    /**
+     * 分批导出出库Excel（解决大数据量内存溢出问题）
+     */
+    public List<Map<String, Object>> outExportStoreExcelBatch(int page, int rows,
+                                                         String wareName, String stackName, String model, String materialName, String standard,
+                                                         String customerName, String plateNo, String carNo, String tallyPeople, String ordNo,
+                                                         String fkComponyName, String remark1, String contractNo, Date fromDate, Date toDate, String userId, String belongId,
+                                                         int offset, int limit) {
+        // 入参空值处理
+        wareName = wareName == null ? "" : wareName;
+        stackName = stackName == null ? "" : stackName;
+        model = model == null ? "" : model;
+        materialName = materialName == null ? "" : materialName;
+        standard = standard == null ? "" : standard;
+        customerName = customerName == null ? "" : customerName;
+        plateNo = plateNo == null ? "" : plateNo;
+        carNo = carNo == null ? "" : carNo;
+        tallyPeople = tallyPeople == null ? "" : tallyPeople;
+        ordNo = ordNo == null ? "" : ordNo;
+        fkComponyName = fkComponyName == null ? "" : fkComponyName;
+        remark1 = remark1 == null ? "" : remark1;
+        contractNo = contractNo == null ? "" : contractNo;
+
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+
+        List<OutRecord> list;
+        // 如果 limit <= 0，使用原来的全量查询
+        if (limit <= 0) {
+            list = outRecordMapper.selectExpt(wareName, stackName, model, materialName, standard, customerName,
+                    plateNo, fromDate, toDate, userId, belongId, carNo, tallyPeople, ordNo, fkComponyName, pltNos, ordNos, remark1, contractNo, contractNos);
+        } else {
+            // 分批查询
+            list = outRecordMapper.selectForExport(wareName, stackName, model, materialName, standard, customerName,
+                    plateNo, fromDate, toDate, userId, belongId, carNo, tallyPeople, ordNo, fkComponyName, pltNos, ordNos, remark1, contractNo, contractNos,
+                    limit, offset);
+        }
+
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        for (OutRecord record : list) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            // 仓库名称
+            map.put("wareName", record.getWareName() != null ? record.getWareName() : "");
+            // 垛位
+            map.put("stackName", record.getStackName() != null ? record.getStackName() : "");
+            // 层号
+            map.put("layer", record.getLayer() != null ? record.getLayer() : "");
+            // 品名
+            map.put("materialName", record.getMaterialName() != null ? record.getMaterialName() : "");
+            // 订单号
+            map.put("ordNo", record.getOrdNo() != null ? record.getOrdNo() : "");
+            // 入库人
+            map.put("inUser", record.getInUser() != null ? record.getInUser() : "");
+            // 入库车号
+            map.put("inCarNo", record.getInCarNo() != null ? record.getInCarNo() : "");
+            // 入库时间
+            map.put("inTime", record.getInTime() != null ? record.getInTime() : "");
+            // 规格型号
+            map.put("model", record.getModel() != null ? record.getModel() : "");
+            // 钢种/规格
+            map.put("standard", record.getStandard() != null ? record.getStandard() : "");
+            // 出库数量
+            map.put("count", record.getCount() != null ? record.getCount() : "");
+            // 出库重量
+            map.put("weight", record.getWeight() != null ? record.getWeight() : "");
+            // 钢板号
+            map.put("plateNo", record.getPlateNo() != null ? record.getPlateNo() : "");
+            // 订单客户
+            map.put("customerName", record.getCustomerName() != null ? record.getCustomerName() : "");
+            // 客户单位
+            map.put("fkComponyName", record.getFkComponyName() != null ? record.getFkComponyName() : "");
+            // 收货地址
+            map.put("receiveAddress", record.getReceiveAddress() != null ? record.getReceiveAddress() : "");
+            // 计量方式
+            map.put("wgtDcnMtcCd", record.getWgtDcnMtcCd() != null ? record.getWgtDcnMtcCd() : "");
+            // 切边类型
+            map.put("edgeTy", record.getEdgeTy() != null ? record.getEdgeTy() : "");
+            // 产地
+            map.put("productionPlace", record.getProductionPlace() != null ? record.getProductionPlace() : "");
+            // 出库车号
+            map.put("outCarNo", record.getOutCarNo() != null ? record.getOutCarNo() : "");
+            // 出库理货人员
+            map.put("tallyPeople", record.getTallyPeople() != null ? record.getTallyPeople() : "");
+            // 出库操作人
+            map.put("addId", record.getAddId() != null ? record.getAddId() : "");
+            // 出库时间
+            map.put("addTime", record.getAddTime() != null ? record.getAddTime() : "");
+            // 备注
+            map.put("remark", record.getRemark() != null ? record.getRemark() : "");
+            // 垛位备注
+            map.put("remark1", record.getRemark1() != null ? record.getRemark1() : "");
+            // 类型
+            map.put("recordType", record.getRecordType() != null ? record.getRecordType() : "");
+            // 合约号
+            map.put("contractNo", record.getContractNo() != null ? record.getContractNo() : "");
+            resultList.add(map);
+        }
+        return resultList;
     }
+
+    /**
+     * 导出库存Excel（使用StoreMapper查询，与入库/出库导出独立）
+     */
+    @Override
+    public List<Map<String, Object>> exportStoreForExcel(String wareName, String stackName, String model, String materialName, String standard,
+                                                         String customerName, String plateNo, String ordNo, String remark1, String fkcustmerName,
+                                                         String userId, String belongId, int offset, int limit) {
+        // 空值处理
+        wareName = wareName == null ? "" : wareName;
+        stackName = stackName == null ? "" : stackName;
+        model = model == null ? "" : model;
+        materialName = materialName == null ? "" : materialName;
+        standard = standard == null ? "" : standard;
+        customerName = customerName == null ? "" : customerName;
+        plateNo = plateNo == null ? "" : plateNo;
+        ordNo = ordNo == null ? "" : ordNo;
+        remark1 = remark1 == null ? "" : remark1;
+        fkcustmerName = fkcustmerName == null ? "" : fkcustmerName;
+        userId = userId == null ? "" : userId;
+        belongId = belongId == null ? "" : belongId;
+
+        List<String> pltNos = new ArrayList<>();
+        List<String> ordNos = new ArrayList<>();
+        if (plateNo.indexOf(",") != -1) {
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1) {
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+
+        // 直接使用 selectStoreForExport 查询，返回 List<Map>
+        return storeMapper.selectStoreForExport(wareName, stackName, model, materialName, standard,
+                customerName, plateNo, ordNo, pltNos, ordNos, userId, belongId, remark1, fkcustmerName, limit, offset);
+    }
+
 }

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -2,7 +2,9 @@ package com.th.demo.service.ware;
 
 import com.th.demo.model.ware.Store;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public interface StoreService {
     String queryLayerByStackId(String stackId, String userId, String belongId);
@@ -30,4 +32,53 @@ public interface StoreService {
      * 修改收货地址
      */
     String modifyReceiveAddress(List<String> id, List<String> inId, String newCustomerAddress);
+
+    /**
+     * 导出入库记录Excel
+     * @return 包含导出数据的List<Map>
+     */
+    List<Map<String, Object>> exportStoreExcel(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
+                                               String plateNo, Date fromDate,
+                                               Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1,String contractNo);
+
+    /**
+     * 分批导出入库记录Excel（解决大数据量内存溢出问题）
+     * @param offset 起始偏移量
+     * @param limit 每批数量
+     * @return 包含导出数据的List<Map>
+     */
+    List<Map<String, Object>> exportStoreExcelBatch(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
+                                               String plateNo, Date fromDate,
+                                               Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1,String contractNo,
+                                               int offset, int limit);
+
+    /**
+     * 导出出库记录Excel
+     * @return 包含导出数据的List<Map>
+     */
+    List<Map<String, Object>> outExportStoreExcel( int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
+                                                   String plateNo, String carNo, String tallyPeople,
+                                                   String ordNo, String fkComponyName,String remark1,String contractNo , Date fromDate, Date toDate, String userId, String belongId);
+
+    /**
+     * 分批导出出库记录Excel（解决大数据量内存溢出问题）
+     * @param offset 起始偏移量
+     * @param limit 每批数量
+     * @return 包含导出数据的List<Map>
+     */
+    List<Map<String, Object>> outExportStoreExcelBatch(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
+                                                   String plateNo, String carNo, String tallyPeople,
+                                                   String ordNo, String fkComponyName, String remark1, String contractNo, Date fromDate, Date toDate, String userId, String belongId,
+                                                   int offset, int limit);
+
+    /**
+     * 导出库存Excel（使用StoreMapper查询，与入库/出库导出独立）
+     * @param offset 起始偏移量
+     * @param limit 每批数量（<=0时全量查询）
+     */
+    List<Map<String, Object>> exportStoreForExcel(String wareName, String stackName, String model, String materialName, String standard,
+                                                   String customerName, String plateNo, String ordNo, String remark1, String fkcustmerName,
+                                                   String userId, String belongId, int offset, int limit);
+
 }
+

src/main/java/com/th/demo/tools/ExportExcelTools.java

@@ -17,10 +17,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -324,17 +321,11 @@ public class ExportExcelTools<T> {
                         patriarch.createPicture(anchor, workbook.addPicture(bsValue, Workbook.PICTURE_TYPE_JPEG));
                     } else {
                         // 其它数据类型都当作字符串简单处理
-
-                        if (i == 0) {
-                            textValue = index  + "";
+                        if (value != null) {
+                            textValue = value.toString();
                             sheet.setColumnWidth(i, (int) (arrWidth[i] * 37.5));
                         } else {
-                            if (value != null) {
-                                textValue = value.toString();
-                                sheet.setColumnWidth(i, (int) (arrWidth[i] * 37.5));
-                            } else {
-                                textValue = "";
-                            }
+                            textValue = "";
                         }
                     }
                     // 如果不是图片数据，就利用正则表达式判断textValue是否全部由数字组成
@@ -366,4 +357,138 @@ public class ExportExcelTools<T> {
             IOUtils.closeQuietly(out);
         }
     }
+
+    // ========== 流式导出支持 ==========
+    private Workbook streamingWorkbook;
+    private Sheet streamingSheet;
+    private int currentRowIndex = 0;
+    private int columnCount = 0;
+
+    /**
+     * 开始流式导出 - 写入表头
+     */
+    public void writeHeaders(String title, String[] headers, String[] columns, int[] arrWidth,
+                             OutputStream out, String pattern) {
+        streamingWorkbook = new SXSSFWorkbook();
+        streamingSheet = streamingWorkbook.createSheet(title);
+        streamingSheet.setDefaultColumnWidth(10);
+        streamingSheet.setDefaultRowHeightInPoints(24);
+
+        XSSFPrintSetup ps = (XSSFPrintSetup) streamingSheet.getPrintSetup();
+        ps.setLandscape(true);
+
+        // 表头样式
+        CellStyle style = streamingWorkbook.createCellStyle();
+        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setAlignment(HorizontalAlignment.CENTER);
+        Font font = streamingWorkbook.createFont();
+        font.setColor(IndexedColors.WHITE.getIndex());
+        font.setFontHeightInPoints((short) 10);
+        font.setBold(true);
+        style.setFont(font);
+
+        // 写入表头
+        Row row = streamingSheet.createRow(0);
+        currentRowIndex = 1;
+        columnCount = headers.length < columns.length ? headers.length : columns.length;
+        for (int i = 0; i < headers.length; i++) {
+            Cell cell = row.createCell(i);
+            cell.setCellStyle(style);
+            RichTextString text = new XSSFRichTextString(headers[i]);
+            cell.setCellValue(text);
+        }
+    }
+
+    /**
+     * 追加数据行
+     */
+    public void appendData(String[] columns, List<Map<String, Object>> dataList, String pattern) {
+        if (streamingSheet == null || dataList == null || dataList.isEmpty()) {
+            return;
+        }
+
+        if (StringUtils.isEmpty(pattern)) {
+            pattern = "yyyy/MM/dd";
+        }
+        FastDateFormat instance = FastDateFormat.getInstance(pattern);
+
+        // 内容样式
+        CellStyle style2 = streamingWorkbook.createCellStyle();
+        style2.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+        style2.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        style2.setBorderBottom(BorderStyle.THIN);
+        style2.setBorderLeft(BorderStyle.THIN);
+        style2.setBorderRight(BorderStyle.THIN);
+        style2.setBorderTop(BorderStyle.THIN);
+        style2.setAlignment(HorizontalAlignment.CENTER);
+        style2.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font font2 = streamingWorkbook.createFont();
+        font2.setBold(true);
+        style2.setFont(font2);
+
+        for (Map<String, Object> map : dataList) {
+            Row row = streamingSheet.createRow(currentRowIndex++);
+            for (int i = 0; i < columnCount; i++) {
+                Cell cell = row.createCell(i);
+                cell.setCellStyle(style2);
+                try {
+                    Object value = map.get(columns[i]);
+                    String textValue = null;
+                    if (value instanceof Date) {
+                        Date date = (Date) value;
+                        textValue = instance.format(date);
+                    } else if (value instanceof byte[]) {
+                        // 图片暂不处理
+                    } else {
+                        textValue = value != null ? value.toString() : "";
+                    }
+                    if (textValue != null) {
+                        Pattern p = Pattern.compile("^//d+(//.//d+)?$");
+                        Matcher matcher = p.matcher(textValue);
+                        if (matcher.matches()) {
+                            cell.setCellValue(Double.parseDouble(textValue));
+                        } else {
+                            RichTextString richString = new XSSFRichTextString(textValue);
+                            Font font3 = streamingWorkbook.createFont();
+                            font3.setColor(IndexedColors.BLACK.index);
+                            richString.applyFont(font3);
+                            cell.setCellValue(richString);
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 完成写入
+     */
+    public void finishWrite(OutputStream out) {
+        if (streamingWorkbook != null) {
+            try {
+                streamingWorkbook.write(out);
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    streamingWorkbook.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                // 清理临时文件
+                if (streamingWorkbook instanceof SXSSFWorkbook) {
+                    ((SXSSFWorkbook) streamingWorkbook).dispose();
+                }
+                streamingWorkbook = null;
+                streamingSheet = null;
+            }
+        }
+    }
 }

src/main/java/com/th/demo/tools/TokenInterceptor.java

@@ -41,7 +41,7 @@ public class TokenInterceptor  implements HandlerInterceptor{
         String userId = request.getHeader("userId");
         String belongId = request.getHeader("belongId");
         String url =  request.getRequestURL().toString();
-        if (url.contains("download")||url.contains("show")){
+        if (url.contains("download")||url.contains("show")||url.contains("Export")){
             request.setAttribute("userId",userId);
             request.setAttribute("belongId",belongId);
             return true;

src/main/resource/mapper/ware/InRecordMapper.xml

@@ -370,6 +370,51 @@
     order by t.add_time desc
   </select>
 
+  <!-- 分页查询导出（不使用 association，避免 N+1 查询问题） -->
+  <select id="selectForExport" resultMap="BaseResultMap" >
+    select
+    a.name as fk_compony_name,t.*
+    from t_ware_in_record t LEFT JOIN t_maint_customer a
+    on   t.fk_compony_name = a.id
+    where   t.ware_name  like concat('%',#{param1,jdbcType=VARCHAR},'%')
+    and t.stack_name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+    and t.model like concat('%',#{param3,jdbcType=INTEGER},'%')
+    and t.material_name like concat('%',#{param4,jdbcType=VARCHAR},'%')
+    and t.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
+    <if test="param6 != null and param6 != ''" >
+      and t.customer_name  = #{param6,jdbcType=VARCHAR}
+    </if>
+      and (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+            <if test="param16 != null and param16.size() !=0" >
+            OR t.plate_no IN <foreach  item="item" collection="param16" index="index"  open="(" separator="," close=")">
+            #{item,jdbcType=VARCHAR}  </foreach>
+            </if>
+          )
+      and (t.contract_no like concat('%',#{param19,jdbcType=VARCHAR},'%')
+      <if test="param20 != null and param20.size() !=0" >
+          OR t.contract_no IN <foreach  item="item" collection="param20" index="index"  open="(" separator="," close=")">
+          #{item,jdbcType=VARCHAR}  </foreach>
+      </if>
+      )
+      and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
+    and t.cancel_flag = '0'
+    and (ifnull(t.ord_no,'*') like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param17 != null and param17.size() !=0" >
+      OR ifnull(t.ord_no,'*') IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>)
+    and ifnull(t.car_no,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
+    and ((t.belong_id=#{param11,jdbcType=VARCHAR} and  t.ware_name in (
+            select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id
+            and  a.user_id = #{param10,jdbcType=VARCHAR}  )
+            )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
+    and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    AND ifnull(t.remark1,'*') like concat('%',#{param18,jdbcType=VARCHAR},'%')
+    order by t.add_time desc
+    LIMIT #{param21,jdbcType=INTEGER} OFFSET #{param22,jdbcType=INTEGER}
+  </select>
+
   <select id="selectTotal" resultMap="TotalResultMap" >
     select
       sum(t.count) as total_amount

src/main/resource/mapper/ware/OutRecordMapper.xml

@@ -519,6 +519,60 @@
     order by t.add_time desc
   </select>
 
+  <!-- 分页查询导出（不使用 association，避免 N+1 查询问题） -->
+  <select id="selectForExport" resultMap="CleanResultMap" >
+    select
+    e.name as fk_compony_name,p.tally_people as tally_people,p.truck_no as out_car_no,f.user_desc as add_id,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time
+    ,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
+    ,t.invoice_price,t.distribution_id,t.contract_no
+    from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id
+    ,t_ware_distribution p,(select t.plate_no,max(t.ord_no) ord_no from t_ware_store t group by t.plate_no) c,t_ware_in_record d
+    LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
+
+    where t.ware_name  like concat('%',#{param1,jdbcType=VARCHAR},'%')
+    and t.stack_name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+    and t.model like concat('%',#{param3,jdbcType=INTEGER},'%')
+    and t.material_name like concat('%',#{param4,jdbcType=VARCHAR},'%')
+    and t.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
+    <if test="param6 != null and param6 != ''" >
+      and t.customer_name  = #{param6,jdbcType=VARCHAR}
+    </if>
+    and (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+        <if test="param16 != null and param16.size() !=0" >
+         OR t.plate_no IN <foreach  item="item" collection="param16" index="index"  open="(" separator="," close=")">
+         #{item,jdbcType=VARCHAR}  </foreach>
+        </if>
+        )
+      and (t.contract_no like concat('%',#{param19,jdbcType=VARCHAR},'%')
+      <if test="param20 != null and param20.size() !=0" >
+          OR t.contract_no IN <foreach  item="item" collection="param20" index="index"  open="(" separator="," close=")">
+          #{item,jdbcType=VARCHAR}  </foreach>
+      </if>
+      )
+    and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
+    and t.distribution_id = p.id
+    and t.plate_no = c.plate_no
+    and t.in_id = d.id
+    and p.truck_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    and t.cancel_flag = '0'
+    and ((t.belong_id=#{param11,jdbcType=VARCHAR} and t.ware_name in (
+    select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id
+    and  a.user_id = #{param10,jdbcType=VARCHAR}  )
+    )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
+    and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
+    and (ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+        <if test="param17 != null and param17.size() !=0" >
+        OR ifnull(c.ord_no,'*') IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+        #{item,jdbcType=VARCHAR}  </foreach>
+        </if>
+        )
+    and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    and ifnull(t.remark1,'*') like concat('%',#{param18,jdbcType=VARCHAR},'%')
+    and ifnull(t.back_flag,0) &lt;> '1'
+    order by t.add_time desc
+    LIMIT #{param21,jdbcType=INTEGER} OFFSET #{param22,jdbcType=INTEGER}
+  </select>
+
   <update id="updateOutDtmByOutId" >
     update t_ware_out_record
     set add_time = #{param2,jdbcType=TIMESTAMP}

src/main/resource/mapper/ware/StoreMapper.xml

@@ -603,4 +603,86 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     <select id="queryStoreById" resultType="java.lang.String" parameterType="java.lang.String">
         select plate_no from t_ware_store where stack_id = #{stackId,jdbcType=VARCHAR} and out_flag = '0' and cancel_flag = '0'
     </select>
+
+    <!-- 库存导出查询（支持分页偏移，直接JOIN获取所有字段） -->
+    <select id="selectStoreForExport" resultType="java.util.Map">
+        SELECT
+            t.layer as layer,
+            b.name as stackName,
+            c.name as materialName,
+            c.standard as materialStandard,
+            t.plate_no as plateNo,
+            t.model as model,
+            t.count as count,
+            t.weight as weight,
+            t.ord_no as ordNo,
+            t.contract_no as contractNo,
+            e.name as customerName,
+            d.name as fkComponyName,
+            t.receive_address as receiveAddress,
+            t.production_place as productionPlace,
+            t.remark as remark,
+            t.remark1 as remark1,
+            t.add_time as addTime,
+            t.car_no as carNo
+        FROM t_ware_store t
+        LEFT JOIN t_maint_ware a ON t.ware_id = a.id
+        LEFT JOIN t_maint_stack b ON t.stack_id = b.id
+        LEFT JOIN t_maint_material c ON t.material_id = c.id
+        LEFT JOIN t_maint_customer d ON t.fk_compony_id = d.id
+        LEFT JOIN t_maint_customer e ON t.customer_id = e.id
+        WHERE 1=1
+        <if test="param1 != null and param1 != ''">
+            AND a.name LIKE CONCAT('%', #{param1}, '%')
+        </if>
+        <if test="param2 != null and param2 != ''">
+            AND e.name LIKE CONCAT('%', #{param2}, '%')
+        </if>
+        <if test="param14 != null and param14 != ''">
+            AND d.name LIKE CONCAT('%', #{param14}, '%')
+        </if>
+        <if test="param3 != null and param3 != ''">
+            AND t.model LIKE CONCAT('%', #{param3}, '%')
+        </if>
+        <if test="param4 != null and param4 != ''">
+            AND c.name LIKE CONCAT('%', #{param4}, '%')
+        </if>
+        <if test="param5 != null and param5 != ''">
+            AND c.standard LIKE CONCAT('%', #{param5}, '%')
+        </if>
+        <if test="param6 != null and param6 != ''">
+            AND e.name LIKE CONCAT('%', #{param6}, '%')
+        </if>
+        <if test="param13 != null and param13 != ''">
+            AND t.remark1 LIKE CONCAT('%', #{param13}, '%')
+        </if>
+        <if test="param7 != null and param7 != ''">
+            AND t.plate_no LIKE CONCAT('%', #{param7}, '%')
+        </if>
+        <if test="param9 != null and param9.size() != 0">
+            OR t.plate_no IN
+            <foreach item="item" collection="param9" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param8 != null and param8 != ''">
+            AND t.ord_no LIKE CONCAT('%', #{param8}, '%')
+        </if>
+        <if test="param10 != null and param10.size() != 0">
+            OR t.ord_no IN
+            <foreach item="item" collection="param10" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        AND t.belong_id = #{param12}
+        AND t.cancel_flag = '0'
+        AND t.out_flag = '0'
+        AND t.ware_id IN (
+            SELECT m.ware_id FROM t_maint_userware m WHERE m.user_id = #{param11}
+        )
+        ORDER BY b.code, t.layer DESC
+        <if test="param17 != null and param17 > 0">
+            LIMIT #{param17} OFFSET #{param18}
+        </if>
+    </select>
 </mapper>