From 8caaa1caf2090f184c0a8249db944ebb05b4ff1a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 19 十二月 2022 14:05:17 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/Sc_PackUnionBillController.cs |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/WebAPI/Controllers/Sc_PackUnionBillController.cs b/WebAPI/Controllers/Sc_PackUnionBillController.cs
index 11bde88..f5f86b2 100644
--- a/WebAPI/Controllers/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/Sc_PackUnionBillController.cs
@@ -61,16 +61,17 @@
             row.CreateCell(0).SetCellValue("杩涚珯鐢熶骇璁㈠崟鍙�");
             row.CreateCell(1).SetCellValue("娴佽浆鍗″彿");
             row.CreateCell(2).SetCellValue("杩涘嚭绔欐墍鐢ㄦ椂闂�");
-            row.CreateCell(3).SetCellValue("宸ユ椂");
-            row.CreateCell(4).SetCellValue("宸ュ簭鍚�");
-            row.CreateCell(5).SetCellValue("涓嶈壇鏁伴噺");
-            row.CreateCell(6).SetCellValue("鎶ュ簾鏁伴噺");
-            row.CreateCell(7).SetCellValue("杩涚珯鏁伴噺");
-            row.CreateCell(8).SetCellValue("鍑虹珯鏁伴噺");
-            row.CreateCell(9).SetCellValue("鍑虹珯鏃堕棿");
-            row.CreateCell(10).SetCellValue("杩涚珯鏃堕棿");
-            row.CreateCell(11).SetCellValue("鍒跺崟浜�");
-            row.CreateCell(12).SetCellValue("鍒跺崟鏃ユ湡");
+            row.CreateCell(3).SetCellValue("绯荤粺宸ユ椂");
+            row.CreateCell(4).SetCellValue("宸ユ椂");
+            row.CreateCell(5).SetCellValue("宸ュ簭鍚�");
+            row.CreateCell(6).SetCellValue("涓嶈壇鏁伴噺");
+            row.CreateCell(7).SetCellValue("鎶ュ簾鏁伴噺");
+            row.CreateCell(8).SetCellValue("杩涚珯鏁伴噺");
+            row.CreateCell(9).SetCellValue("鍑虹珯鏁伴噺");
+            row.CreateCell(10).SetCellValue("鍑虹珯鏃堕棿");
+            row.CreateCell(11).SetCellValue("杩涚珯鏃堕棿");
+            row.CreateCell(12).SetCellValue("鍒跺崟浜�");
+            row.CreateCell(13).SetCellValue("鍒跺崟鏃ユ湡");
             //绮剧‘鎺у埗鍒楀
             sheet.SetColumnWidth(1, 5000);
             sheet.SetColumnWidth(2, 5000);
@@ -85,26 +86,28 @@
             sheet.SetColumnWidth(11, 5000);
             sheet.SetColumnWidth(12, 5000);
             sheet.SetColumnWidth(13, 5000);
+            sheet.SetColumnWidth(14, 5000);
             LogService.Write("swhere锛�" + sWhere);
             string sql = "select * from h_v_Sc_StationInBillListMain" + sWhere + " order by hmainid desc";
             DataSet ds = oCn.RunProcReturn(sql, "h_v_Sc_StationInBillListMain");
-            LogService.Write("sql璇彞锛�" +sql);
+            LogService.Write("sql璇彞锛�" + sql);
             for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
             {
                 IRow row1 = sheet.CreateRow(i + 1);
                 row1.CreateCell(0).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鐢熶骇璁㈠崟鍙�"].ToString());
                 row1.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
                 row1.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
-                row1.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
-                row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["宸ュ簭鍚�"].ToString());
-                row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
-                row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
-                row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
-                row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
-                row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
-                row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
-                row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
-                row1.CreateCell(12).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
+                row1.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�(灏忔椂)"].ToString());
+                row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
+                row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["宸ュ簭鍚�"].ToString());
+                row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
+                row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
+                row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
+                row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
+                row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
+                row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
+                row1.CreateCell(12).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
+                row1.CreateCell(13).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
             }
             System.IO.MemoryStream ms = new System.IO.MemoryStream();
             workbook.Write(ms);

--
Gitblit v1.9.1