From f19044df4868173b951e81b377869666d16806dd Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 13 六月 2022 17:28:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/NpoiHelper.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
index 8f66487..a4220f8 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
@@ -26,8 +26,10 @@
/// <param name="FileName">鏂囦欢缁濆璺緞</param>
/// <param name="startRow">鏁版嵁寮�濮嬭鏁�(1涓虹涓�琛�)</param>
/// <param name="ColumnDataType">姣忓垪鐨勬暟鎹被鍨�</param>
+ /// <param name="numType">鑾峰彇鏁版嵁绨跨殑绫诲瀷</param>
+ /// <param name="name">宸ヤ綔绨跨殑鍚嶅瓧</param>
/// <returns></returns>
- public DataSet ReadExcel(string FileName, int startRow, params NpoiDataType[] ColumnDataType)
+ public DataSet ReadExcel(string FileName, int startRow,int numType,string name, params NpoiDataType[] ColumnDataType)
{
string colNamePix = "F";
int ertime = 0;
@@ -40,8 +42,17 @@
{
IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡
//for (int k = 0; k < 14; k++)
- //{
- ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet
+ ISheet sheet = null ; //{
+ if (numType == 1)//numType==1 鑾峰彇宸ヤ綔绨挎寜鐓т笅鏍�
+ {
+ sheet = workbook.GetSheetAt(int.Parse(name));//寰楀埌閲岄潰绗竴涓猻heet
+ }
+ else if (numType == 2)//numType==12 鑾峰彇宸ヤ綔绨挎寜鐓� 宸ヤ綔绨跨殑鍚嶅瓧
+ {
+ sheet = workbook.GetSheet(name);//寰楀埌閲岄潰绗竴涓猻heet
+ }
+
+
int j;
IRow row;
#region ColumnDataType璧嬪��
--
Gitblit v1.9.1