工单明细导出全部已出数量

src/main/java/com/neotel/smfcore/common/utils/FileUtil.java

@@ -25,6 +25,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.config.file.CustomCellWriteHeightConfig;
 import com.neotel.smfcore.common.config.file.CustomCellWriteHeightConfig;
 import com.neotel.smfcore.common.config.file.CustomCellWriteWeightConfig;
 import com.neotel.smfcore.common.config.file.CustomCellWriteWeightConfig;
@@ -389,10 +390,13 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
         WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
         WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
         contentWriteCellStyle.setWrapped(true);
         contentWriteCellStyle.setWrapped(true);
-        EasyExcel.write(response.getOutputStream()).sheet("Sheet1").head(headers)
-                .registerWriteHandler(new CustomCellWriteHeightConfig())
-                .registerWriteHandler(new CustomCellWriteWeightConfig())
+        EasyExcel.write(response.getOutputStream())
+                .sheet("Sheet1")
+                .head(headers)
+                //.registerWriteHandler(new CustomCellWriteHeightConfig())
+                //.registerWriteHandler(new CustomCellWriteWeightConfig())
                 .registerWriteHandler(new HorizontalCellStyleStrategy(null, contentWriteCellStyle))
                 .registerWriteHandler(new HorizontalCellStyleStrategy(null, contentWriteCellStyle))
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                 .doWrite(datas);
                 .doWrite(datas);
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -407,9 +407,9 @@ public class OrderController {
                 data.add(orderItem.getTableNo());
                 data.add(orderItem.getTableNo());
                 data.add(orderItem.getFeederInfo());
                 data.add(orderItem.getFeederInfo());
                 data.add(orderItem.getNeedReelCount());
                 data.add(orderItem.getNeedReelCount());
-                data.add(orderItem.getOutReelCount());
+                data.add(orderItem.getTotalOutReelCount());
                 data.add(orderItem.getNeedNum());
                 data.add(orderItem.getNeedNum());
-                data.add(orderItem.getOutNum());
+                data.add(orderItem.getTotalOutNum());
                 data.add(orderItem.getBarcodeStr());
                 data.add(orderItem.getBarcodeStr());
                 //附加字段
                 //附加字段
                 if(orderSetting.getAppendData()!=null&&orderSetting.getAppendData().size()>0){
                 if(orderSetting.getAppendData()!=null&&orderSetting.getAppendData().size()>0){