From 974bbe1a86f5083fe56b394148da0e4ec935c3e8 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 09 五月 2022 09:57:02 +0800 Subject: [PATCH] 导入页面 --- WebAPI/Controllers/SCGL/日计划管理/NpoiHelper.cs | 1328 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebAPI/packages.config | 5 WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 49 ++ WebAPI/WebAPI.csproj | 27 + 4 files changed, 1,409 insertions(+), 0 deletions(-) diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" new file mode 100644 index 0000000..9705a9f --- /dev/null +++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" @@ -0,0 +1,49 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞� +{ + public class JIT_DayPlanPlatFormImportController : ApiController + { + private json objJsonResult = new json(); + public DataSet ds = new DataSet(); + public WebServer webserver = new WebServer(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + #region 鐢熶骇鏃ヨ鍒掑鍏� + [Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_DR")] + [HttpPost] + public object JIT_DayPlanPlatFormImport_DR(HttpPostedFileBase file) + { + try + { + if (file != null) + { + NpoiHelper np = new NpoiHelper(); + DataSet ds = np.ReadExcel(@"C:\Users\Harold\Desktop\鏂板缓XLS宸ヤ綔琛�.xls", 1); + DataTable dt = ds.Tables[0]; + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + } +} \ No newline at end of file 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" new file mode 100644 index 0000000..8f66487 --- /dev/null +++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs" @@ -0,0 +1,1328 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.IO; +using NPOI.HSSF.UserModel; +using System.Data; +using System.Drawing; +using NPOI.HSSF.Util; +using NPOI.SS.UserModel; +using NPOI.HPSF; +using NPOI.XSSF.UserModel; + +namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞� +{ + /// <summary> + /// Excel鏂囦欢鍒癉ataSet鐨勮浆鎹㈢被 + /// </summary> + public class NpoiHelper + { + #region 璇诲彇Excel鏂囦欢鍐呭杞崲涓篋ataSet + + int ReadExcelEndRow = 0; + /// <summary> + /// 璇诲彇Excel鏂囦欢鍐呭杞崲涓篋ataSet,鍒楀悕渚濇涓� "c0"鈥︹�[columnlength-1] + /// </summary> + /// <param name="FileName">鏂囦欢缁濆璺緞</param> + /// <param name="startRow">鏁版嵁寮�濮嬭鏁�(1涓虹涓�琛�)</param> + /// <param name="ColumnDataType">姣忓垪鐨勬暟鎹被鍨�</param> + /// <returns></returns> + public DataSet ReadExcel(string FileName, int startRow, params NpoiDataType[] ColumnDataType) + { + string colNamePix = "F"; + int ertime = 0; + int intime = 0; + DataSet ds = new DataSet("ds"); + DataTable dt = new DataTable("dt"); + DataRow dr; + StringBuilder sb = new StringBuilder(); + using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read)) + { + IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡 + //for (int k = 0; k < 14; k++) + //{ + ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet + int j; + IRow row; + #region ColumnDataType璧嬪�� + if (ColumnDataType.Length <= 0) + { + row = sheet.GetRow(startRow - 1);//寰楀埌绗琲琛� + ColumnDataType = new NpoiDataType[row.LastCellNum]; + for (int i = 0; i < row.LastCellNum; i++) + { + ICell hs = row.GetCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK); + ColumnDataType[i] = GetCellDataType(hs); //NpoiDataType.Blank; + //if (i == 6) + //{ + // ColumnDataType[i] = NpoiDataType.Numeric; + //} + } + } + #endregion + for (j = 0; j < ColumnDataType.Length; j++) + { + Type tp = GetDataTableType(ColumnDataType[j]); + //if (j == 6) + //{ + // tp = typeof(double); + //} + dt.Columns.Add(colNamePix + (j + 1), tp); + } + + ReadExcelEndRow = ReadExcelEndRow == 0 ? sheet.PhysicalNumberOfRows : ReadExcelEndRow; + for (int i = startRow - 1; i <= ReadExcelEndRow; i++) + { + row = sheet.GetRow(i);//寰楀埌绗琲琛� + if (row == null) continue; + try + { + dr = dt.NewRow(); + + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + dt.Rows.Add(dr); + intime++; + } + catch (Exception er) + { + ertime++; + sb.Append(string.Format("绗瑊0}琛屽嚭閿欙細{1}\r\n", i + 1, er.Message)); + continue; + } + } + ds.Tables.Add(dt); + //} + } + if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString()); + return ds; + } + #endregion + #region//璇诲彇澶氫釜sheet + public DataSet ReadExcelSub(string FileName, int startRow, params NpoiDataType[] ColumnDataType) + { + string colNamePix = "F"; + int ertime = 0; + int intime = 0; + DataSet ds = new DataSet("ds"); + DataTable dt0 = new DataTable("dt0"); + DataTable dt1 = new DataTable("dt1"); + DataTable dt2 = new DataTable("dt2"); + DataTable dt3 = new DataTable("dt3"); + DataTable dt4 = new DataTable("dt4"); + DataTable dt5 = new DataTable("dt5"); + DataTable dt6 = new DataTable("dt6"); + DataTable dt7 = new DataTable("dt7"); + DataTable dt8 = new DataTable("dt8"); + DataTable dt9 = new DataTable("dt9"); + DataTable dt10 = new DataTable("dt10"); + DataTable dt11 = new DataTable("dt11"); + DataTable dt12 = new DataTable("dt12"); + DataTable dt13 = new DataTable("dt13"); + + + DataRow dr; + StringBuilder sb = new StringBuilder(); + using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read)) + { + + + //鏍规嵁璺緞閫氳繃宸插瓨鍦ㄧ殑excel鏉ュ垱寤篐SSFWorkbook锛屽嵆鏁翠釜excel鏂囨。 + + HSSFWorkbook workbook = new HSSFWorkbook(stream); + //XSSFWorkbook workbook = new XSSFWorkbook(stream); + int x = workbook.NumberOfSheets; + + List<string> sheetNames = new List<string>(); + + for (int i = 0; i < x; i++) + { + + //sheetNames.Add(workbook.Workbook.GetSheetName(i)); + ISheet sheet = workbook.GetSheetAt(i); + int j; + IRow row; + #region ColumnDataType璧嬪�� + if (ColumnDataType.Length <= 0) + { + row = sheet.GetRow(startRow - 1);//寰楀埌绗琲琛� + ColumnDataType = new NpoiDataType[row.LastCellNum]; + for (int a = 0; x < row.LastCellNum; a++) + { + ICell hs = row.GetCell(a, MissingCellPolicy.CREATE_NULL_AS_BLANK); + ColumnDataType[a] = GetCellDataType(hs); //NpoiDataType.Blank; + + } + } + #endregion + + for (j = 0; j < ColumnDataType.Length; j++) + { + Type tp = GetDataTableType(ColumnDataType[j]);//寰楀埌姣忎竴鍒楃殑绫诲瀷 + ReadExcelEndRow = 0; + if (i == 0) + { + dt0.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 1) + { + dt1.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 2) + { + dt2.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 3) + { + dt3.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 4) + { + dt4.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 5) + { + dt5.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 6) + { + dt6.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 7) + { + dt7.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 8) + { + dt8.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 9) + { + dt9.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 10) + { + dt10.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 11) + { + dt11.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 12) + { + dt12.Columns.Add(colNamePix + (j + 1), tp); + } + else if (i == 13) + { + dt13.Columns.Add(colNamePix + (j + 1), tp); + } + } + + ReadExcelEndRow = ReadExcelEndRow == 0 ? sheet.PhysicalNumberOfRows : ReadExcelEndRow; + for (int a = startRow - 1; a <= ReadExcelEndRow; a++) + { + row = sheet.GetRow(a);//寰楀埌绗琲琛� + if (row == null) continue; + try + { + if (i == 0) + { + dr = dt0.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt0.Rows.Add(dr); + intime++; + } + else if (i == 1) + { + dr = dt1.NewRow(); + + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt1.Rows.Add(dr); + intime++; + } + else if (i == 2) + { + dr = dt2.NewRow(); + + + + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt2.Rows.Add(dr); + intime++; + } + else if (i == 3) + { + dr = dt3.NewRow(); + + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt3.Rows.Add(dr); + intime++; + } + else if (i == 4) + { + dr = dt4.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt4.Rows.Add(dr); + intime++; + } + else if (i == 5) + { + dr = dt5.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt5.Rows.Add(dr); + intime++; + } + else if (i == 6) + { + dr = dt6.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt6.Rows.Add(dr); + intime++; + } + else if (i == 7) + { + dr = dt7.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt7.Rows.Add(dr); + intime++; + } + else if (i == 8) + { + dr = dt8.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt8.Rows.Add(dr); + intime++; + } + else if (i == 9) + { + dr = dt9.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt9.Rows.Add(dr); + intime++; + } + else if (i == 10) + { + dr = dt10.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt10.Rows.Add(dr); + intime++; + } + else if (i == 11) + { + dr = dt11.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt11.Rows.Add(dr); + intime++; + } + else if (i == 12) + { + dr = dt12.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt12.Rows.Add(dr); + intime++; + } + else if (i == 13) + { + dr = dt13.NewRow(); + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j); + } + + dt13.Rows.Add(dr); + intime++; + } + + } + catch (Exception er) + { + ertime++; + sb.Append(string.Format("绗瑊0}琛屽嚭閿欙細{1}\r\n", i + 1, er.Message)); + continue; + } + } + if (i == 0) + { + ds.Tables.Add(dt0); + } + else if (i == 1) + { + ds.Tables.Add(dt1); + } + else if (i == 2) + { + ds.Tables.Add(dt2); + } + else if (i == 3) + { + ds.Tables.Add(dt3); + } + else if (i == 4) + { + ds.Tables.Add(dt4); + } + else if (i == 5) + { + ds.Tables.Add(dt5); + } + else if (i == 6) + { + ds.Tables.Add(dt6); + } + else if (i == 7) + { + ds.Tables.Add(dt7); + } + else if (i == 8) + { + ds.Tables.Add(dt8); + } + else if (i == 9) + { + ds.Tables.Add(dt9); + } + else if (i == 10) + { + ds.Tables.Add(dt10); + } + else if (i == 11) + { + ds.Tables.Add(dt11); + } + else if (i == 12) + { + ds.Tables.Add(dt12); + } + else if (i == 13) + { + ds.Tables.Add(dt13); + } + + } + //IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡 + //ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet + + } + //if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString()); + return ds; + } + #endregion + Color LevelOneColor = Color.Green; + Color LevelTwoColor = Color.FromArgb(201, 217, 243); + Color LevelThreeColor = Color.FromArgb(231, 238, 248); + Color LevelFourColor = Color.FromArgb(232, 230, 231); + Color LevelFiveColor = Color.FromArgb(250, 252, 213); + public List<DataSet> ReadExcelBySheetIndex(string FileName, int startRow, string str) + { + List<DataSet> listDs = new List<DataSet>(); + + StringBuilder sb = new StringBuilder(); + using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read)) + { + IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡 + // ISheet sheet = workbook.GetSheetAt(SheetIndex);//寰楀埌閲岄潰绗竴涓猻heet + + List<string> listSheet = GetSheetNames(workbook); + ISheet sheet; + + foreach (string sheetName in listSheet) + { + DataSet ds = new DataSet("ds"); + DataTable dt = new DataTable("dt"); + sheet = workbook.GetSheet(sheetName); + if (!sheetName.Contains(str)) + { + continue; + } + NPOI.SS.UserModel.IRow headerRow = sheet.GetRow(0); + int cellCount = headerRow.LastCellNum; + + for (int j = 0; j < cellCount; j++) + { + NPOI.SS.UserModel.ICell cell = headerRow.GetCell(j); + dt.Columns.Add("F" + j.ToString()); + } + + int r = sheet.PhysicalNumberOfRows; + for (int i = (sheet.FirstRowNum); i <= 2900; i++) + { + NPOI.SS.UserModel.IRow row = null; + try + { + row = sheet.GetRow(i); + int ex = row.FirstCellNum; + } + catch (Exception) + { + continue; + } + DataRow dataRow = dt.NewRow(); + + for (int j = row.FirstCellNum; j < cellCount; j++) + { + try + { + if (row.GetCell(j) != null || row.GetCell(j).ToString() != "") + //dataRow[j] = row.GetCell(j).ToString(); + dataRow[j] = GetCellData(row, j); + } + catch (Exception ex) + { + string s = ex.ToString(); + } + } + dt.Rows.Add(dataRow); + } + ds.Tables.Add(dt); + listDs.Add(ds); + } + // if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString()); + } + + return listDs; + + } + public List<string> GetSheetNames(IWorkbook workbook) + { + int x = workbook.NumberOfSheets; + List<string> sheetNames = new List<string>(); + for (int i = 0; i < x; i++) + { + sheetNames.Add(workbook.GetSheetName(i)); + } + return sheetNames; + } + public object GetCellData(IRow row, int column) + { + try + { + ICell hs = row.GetCell(column); + NpoiDataType datatype = GetCellDataType(hs); //NpoiDataType.Blank; + object obj = row.GetCell(column) ?? null; + if (datatype == NpoiDataType.Datetime) + { + string v = ""; + try + { + v = row.GetCell(column).StringCellValue; + } + catch (Exception e1) + { + v = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss"); + } + if (v != "") + { + try + { + obj = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss"); + + } + catch (Exception e2) + { + obj = Convert.ToDateTime(v).ToString("yyyy-MM-dd hh:mm:ss"); + } + } + else + obj = DBNull.Value; + + + } + else if (datatype == NpoiDataType.Numeric) + { + obj = DBNull.Value; + try + { + //if (row.GetCell(column).StringCellValue != "") + obj = row.GetCell(column).NumericCellValue; + } + catch (Exception e3) + { + obj = row.GetCell(column).StringCellValue; + } + + } + else if (datatype == NpoiDataType.String && hs.CellType == CellType.Formula) + { + obj = row.GetCell(column).StringCellValue; + } + return obj; + } + catch (Exception e22) + { + return ""; + } + } + #region 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2003 + /// <summary> + /// 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2003 + /// </summary> + /// <param name="SaveFileName">鏂囦欢淇濆瓨璺緞</param> + /// <param name="SheetName">Excel鏂囦欢涓殑Sheet鍚嶇О</param> + /// <param name="ds">瀛樺偍鏁版嵁鐨凞ataSet</param> + /// <param name="startRow">浠庡摢涓�琛屽紑濮嬪啓鍏ワ紝浠�0寮�濮�</param> + /// <param name="datatypes">DataSet涓殑鍚勫垪瀵瑰簲鐨勬暟鎹被鍨�</param> + public bool CreateExcel2003(string SaveFileName, string SheetName, DataSet ds, int startRow, params NpoiDataType[] datatypes) + { + try + { + if (startRow < 0) startRow = 0; + HSSFWorkbook wb = new HSSFWorkbook(); + wb = new HSSFWorkbook(); + DocumentSummaryInformation dsi = PropertySetFactory.CreateDocumentSummaryInformation(); + dsi.Company = "pkm"; + SummaryInformation si = PropertySetFactory.CreateSummaryInformation(); + si.Title = + si.Subject = "automatic genereted document"; + si.Author = "pkm"; + wb.DocumentSummaryInformation = dsi; + wb.SummaryInformation = si; + ISheet sheet = wb.CreateSheet(SheetName); + //sheet.SetColumnWidth(0, 50 * 256); + //sheet.SetColumnWidth(1, 100 * 256); + IRow row; + ICell cell; + DataRow dr; + int j; + int maxLength = 0; + int curLength = 0; + object columnValue; + DataTable dt = ds.Tables[0]; + if (datatypes.Length < dt.Columns.Count) + { + datatypes = new NpoiDataType[dt.Columns.Count]; + for (int i = 0; i < dt.Columns.Count; i++) + { + string dtcolumntype = dt.Columns[i].DataType.Name.ToLower(); + switch (dtcolumntype) + { + case "string": + datatypes[i] = NpoiDataType.String; + break; + case "datetime": + datatypes[i] = NpoiDataType.Datetime; + break; + case "boolean": + datatypes[i] = NpoiDataType.Bool; + break; + case "double": + datatypes[i] = NpoiDataType.Numeric; + break; + default: + datatypes[i] = NpoiDataType.String; + break; + } + } + } + + #region 鍒涘缓琛ㄥご + row = sheet.CreateRow(0);//鍒涘缓绗琲琛� + ICellStyle style1 = wb.CreateCellStyle();//鏍峰紡 + IFont font1 = wb.CreateFont();//瀛椾綋 + + font1.Color = HSSFColor.White.Index;//瀛椾綋棰滆壊 + font1.Boldweight = (short)FontBoldWeight.Bold;//瀛椾綋鍔犵矖鏍峰紡 + //style1.FillBackgroundColor = HSSFColor.WHITE.index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鍥炬鑹� + style1.FillForegroundColor = HSSFColor.Green.Index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鑳屾櫙鑹� + style1.FillPattern = FillPattern.SolidForeground; + style1.SetFont(font1);//鏍峰紡閲岀殑瀛椾綋璁剧疆鍏蜂綋鐨勫瓧浣撴牱寮� + style1.Alignment = HorizontalAlignment.Center;//鏂囧瓧姘村钩瀵归綈鏂瑰紡 + style1.VerticalAlignment = VerticalAlignment.Center;//鏂囧瓧鍨傜洿瀵归綈鏂瑰紡 + row.HeightInPoints = 25; + for (j = 0; j < dt.Columns.Count; j++) + { + columnValue = dt.Columns[j].ColumnName; + curLength = Encoding.Default.GetByteCount(columnValue.ToString()); + maxLength = (maxLength < curLength ? curLength : maxLength); + int colounwidth = 256 * maxLength; + sheet.SetColumnWidth(j, colounwidth); + try + { + cell = row.CreateCell(j);//鍒涘缓绗�0琛岀殑绗琷鍒� + cell.CellStyle = style1;//鍗曞厓鏍煎紡璁剧疆鏍峰紡 + + cell.SetCellType(CellType.String); + cell.SetCellValue(columnValue.ToString()); + + + } + catch + { + continue; + } + } + #endregion + + #region 鍒涘缓姣忎竴琛� + for (int i = startRow; i < ds.Tables[0].Rows.Count; i++) + { + dr = ds.Tables[0].Rows[i]; + row = sheet.CreateRow(i + 1);//鍒涘缓绗琲琛� + for (j = 0; j < dt.Columns.Count; j++) + { + columnValue = dr[j]; + curLength = Encoding.Default.GetByteCount(columnValue.ToString()); + maxLength = (maxLength < curLength ? curLength : maxLength); + int colounwidth = 256 * maxLength; + sheet.SetColumnWidth(j, colounwidth); + try + { + cell = row.CreateCell(j);//鍒涘缓绗琲琛岀殑绗琷鍒� + #region 鎻掑叆绗琷鍒楃殑鏁版嵁 + try + { + NpoiDataType dtype = datatypes[j]; + switch (dtype) + { + case NpoiDataType.String: + { + cell.SetCellType(CellType.String); + cell.SetCellValue(columnValue.ToString()); + } + break; + case NpoiDataType.Datetime: + { + cell.SetCellType(CellType.String); + cell.SetCellValue(columnValue.ToString()); + } + break; + case NpoiDataType.Numeric: + { + cell.SetCellType(CellType.Numeric); + cell.SetCellValue(Convert.ToDouble(columnValue)); + } + break; + case NpoiDataType.Bool: + { + cell.SetCellType(CellType.Boolean); + cell.SetCellValue(Convert.ToBoolean(columnValue)); + } + break; + case NpoiDataType.Richtext: + { + cell.SetCellType(CellType.Formula); + cell.SetCellValue(columnValue.ToString()); + } + break; + } + } + catch + { + cell.SetCellType(CellType.String); + cell.SetCellValue(columnValue.ToString()); + } + #endregion + + } + catch + { + continue; + } + } + } + #endregion + + //using (FileStream fs = new FileStream(@SaveFileName, FileMode.OpenOrCreate))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓� + //{ + // wb.Write(fs); + //} + //string SaveFileName = "output.xls"; + using (FileStream fs = new FileStream(@SaveFileName, FileMode.OpenOrCreate, FileAccess.Write))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓� + { + wb.Write(fs); + Console.WriteLine("鏂囦欢淇濆瓨鎴愬姛锛�" + SaveFileName); + } + + return true; + } + catch (Exception er) + { + Console.WriteLine("鏂囦欢淇濆瓨鎴愬姛锛�" + SaveFileName); + return false; + } + + } + #endregion + + #region 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2007 + /// <summary> + /// 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2007 + /// </summary> + /// <param name="SaveFileName">鏂囦欢淇濆瓨璺緞</param> + /// <param name="SheetName">Excel鏂囦欢涓殑Sheet鍚嶇О</param> + /// <param name="ds">瀛樺偍鏁版嵁鐨凞ataSet</param> + /// <param name="startRow">浠庡摢涓�琛屽紑濮嬪啓鍏ワ紝浠�0寮�濮�</param> + /// <param name="datatypes">DataSet涓殑鍚勫垪瀵瑰簲鐨勬暟鎹被鍨�</param> + public bool CreateExcel2007(string SaveFileName, string SheetName, DataSet ds, int startRow, params NpoiDataType[] datatypes) + { + try + { + if (startRow < 0) startRow = 0; + XSSFWorkbook wb = new XSSFWorkbook(); + ISheet sheet = wb.CreateSheet(SheetName); + //sheet.SetColumnWidth(0, 50 * 256); + //sheet.SetColumnWidth(1, 100 * 256); + IRow row; + ICell cell; + DataRow dr; + int j; + int maxLength = 0; + int curLength = 0; + object columnValue; + DataTable dt = ds.Tables[0]; + if (datatypes.Length < dt.Columns.Count) + { + datatypes = new NpoiDataType[dt.Columns.Count]; + for (int i = 0; i < dt.Columns.Count; i++) + { + string dtcolumntype = dt.Columns[i].DataType.Name.ToLower(); + switch (dtcolumntype) + { + case "string": + datatypes[i] = NpoiDataType.String; + break; + case "datetime": + datatypes[i] = NpoiDataType.Datetime; + break; + case "boolean": + datatypes[i] = NpoiDataType.Bool; + break; + case "double": + datatypes[i] = NpoiDataType.Numeric; + break; + default: + datatypes[i] = NpoiDataType.String; + break; + } + } + } + + #region 鍒涘缓琛ㄥご + row = sheet.CreateRow(0);//鍒涘缓绗琲琛� + ICellStyle style1 = wb.CreateCellStyle();//鏍峰紡 + IFont font1 = wb.CreateFont();//瀛椾綋 + + font1.Color = HSSFColor.White.Index;//瀛椾綋棰滆壊 + font1.Boldweight = (short)FontBoldWeight.Bold;//瀛椾綋鍔犵矖鏍峰紡 + //style1.FillBackgroundColor = HSSFColor.WHITE.index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鍥炬鑹� + style1.FillForegroundColor = HSSFColor.Green.Index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鑳屾櫙鑹� + style1.FillPattern = FillPattern.SolidForeground; + style1.SetFont(font1);//鏍峰紡閲岀殑瀛椾綋璁剧疆鍏蜂綋鐨勫瓧浣撴牱寮� + style1.Alignment = HorizontalAlignment.Center;//鏂囧瓧姘村钩瀵归綈鏂瑰紡 + style1.VerticalAlignment = VerticalAlignment.Center;//鏂囧瓧鍨傜洿瀵归綈鏂瑰紡 + //row.HeightInPoints = 25; + row.HeightInPoints = 15; + for (j = 0; j < dt.Columns.Count; j++) + { + columnValue = dt.Columns[j].ColumnName; + curLength = Encoding.Default.GetByteCount(columnValue.ToString()); + maxLength = (maxLength < curLength ? curLength : maxLength); + int colounwidth = 256 * maxLength; + sheet.SetColumnWidth(j, colounwidth); + try + { + cell = row.CreateCell(j);//鍒涘缓绗�0琛岀殑绗琷鍒� + cell.CellStyle = style1;//鍗曞厓鏍煎紡璁剧疆鏍峰紡 + + //cell.SetCellType(CellType.STRING); + cell.SetCellValue(columnValue.ToString()); + } + catch + { + continue; + } + } + #endregion + + #region 鍒涘缓姣忎竴琛� + for (int i = startRow; i < ds.Tables[0].Rows.Count; i++) + { + dr = ds.Tables[0].Rows[i]; + row = sheet.CreateRow(i + 1);//鍒涘缓绗琲琛� + for (j = 0; j < dt.Columns.Count; j++) + { + columnValue = dr[j]; + curLength = Encoding.Default.GetByteCount(columnValue.ToString()); + maxLength = (maxLength < curLength ? curLength : maxLength); + //int colounwidth = 256 * maxLength; + int colounwidth = 3000; + sheet.SetColumnWidth(j, colounwidth); + try + { + cell = row.CreateCell(j);//鍒涘缓绗琲琛岀殑绗琷鍒� + #region 鎻掑叆绗琷鍒楃殑鏁版嵁 + try + { + NpoiDataType dtype = datatypes[j]; + switch (dtype) + { + case NpoiDataType.String: + { + //cell.SetCellType(CellType.STRING); + cell.SetCellValue(columnValue.ToString()); + } + break; + case NpoiDataType.Datetime: + { + // cell.SetCellType(CellType.STRING); + cell.SetCellValue(columnValue.ToString()); + } + break; + case NpoiDataType.Numeric: + { + //cell.SetCellType(CellType.NUMERIC); + cell.SetCellValue(Convert.ToDouble(columnValue)); + } + break; + case NpoiDataType.Bool: + { + //cell.SetCellType(CellType.BOOLEAN); + cell.SetCellValue(Convert.ToBoolean(columnValue)); + } + break; + case NpoiDataType.Richtext: + { + // cell.SetCellType(CellType.FORMULA); + cell.SetCellValue(columnValue.ToString()); + } + break; + } + } + catch + { + //cell.SetCellType(HSSFCell.CELL_TYPE_STRING); + cell.SetCellValue(columnValue.ToString()); + } + #endregion + + } + catch + { + continue; + } + } + } + #endregion + + //using (FileStream fs = new FileStream(@SaveFileName, FileMode.OpenOrCreate))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓� + //{ + // wb.Write(fs); + //} + //string SaveFileName = "output.xlsx"; + using (FileStream fs = new FileStream(SaveFileName, FileMode.OpenOrCreate, FileAccess.Write))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓� + { + wb.Write(fs); + Console.WriteLine("鏂囦欢淇濆瓨鎴愬姛锛�" + SaveFileName); + } + return true; + } + catch (Exception er) + { + Console.WriteLine("鏂囦欢淇濆瓨澶辫触锛�" + SaveFileName); + return false; + } + + } + #endregion + + private short GetXLColour(HSSFWorkbook workbook, System.Drawing.Color SystemColour) + { + short s = 0; + HSSFPalette XlPalette = workbook.GetCustomPalette(); + HSSFColor XlColour = XlPalette.FindColor(SystemColour.R, SystemColour.G, SystemColour.B); + if (XlColour == null) + { + if (NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE < 255) + { + if (NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE < 64) + { + //NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE= 64; + //NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE += 1; + XlColour = XlPalette.AddColor(SystemColour.R, SystemColour.G, SystemColour.B); + } + else + { + XlColour = XlPalette.FindSimilarColor(SystemColour.R, SystemColour.G, SystemColour.B); + } + s = XlColour.Indexed; + } + } + else + s = XlColour.Indexed; + return s; + } + + #region 璇籈xcel-鏍规嵁NpoiDataType鍒涘缓鐨凞ataTable鍒楃殑鏁版嵁绫诲瀷 + /// <summary> + /// 璇籈xcel-鏍规嵁NpoiDataType鍒涘缓鐨凞ataTable鍒楃殑鏁版嵁绫诲瀷 + /// </summary> + /// <param name="datatype"></param> + /// <returns></returns> + private Type GetDataTableType(NpoiDataType datatype) + { + Type tp = typeof(string);//Type.GetType("System.String") + switch (datatype) + { + case NpoiDataType.Bool: + tp = typeof(bool); + break; + case NpoiDataType.Datetime: + tp = typeof(DateTime); + break; + case NpoiDataType.Numeric: + tp = typeof(double); + break; + case NpoiDataType.Error: + tp = typeof(string); + break; + case NpoiDataType.Blank: + tp = typeof(string); + break; + } + return tp; + } + #endregion + + #region 璇籈xcel-寰楀埌涓嶅悓鏁版嵁绫诲瀷鍗曞厓鏍肩殑鏁版嵁 + /// <summary> + /// 璇籈xcel-寰楀埌涓嶅悓鏁版嵁绫诲瀷鍗曞厓鏍肩殑鏁版嵁 + /// </summary> + /// <param name="datatype">鏁版嵁绫诲瀷</param> + /// <param name="row">鏁版嵁涓殑涓�琛�</param> + /// <param name="column">鍝垪</param> + /// <returns></returns> + private object GetCellData(NpoiDataType datatype, IRow row, int column) + { + var objcell = row.GetCell(column); + + object obj = objcell ?? null; + if (obj == null) + { + return null; + } + + if (obj.ToString().Contains("鏈�") && obj.ToString().Contains("-") && objcell.DateCellValue != null) + { + datatype = NpoiDataType.Datetime; + } + else if (objcell.CellType == CellType.Numeric && (obj.ToString().Contains("-") || obj.ToString().Contains("/")) && objcell.DateCellValue != null) + { + datatype = NpoiDataType.Datetime; + } + + + if (datatype == NpoiDataType.Datetime) + { + string v = ""; + try + { + v = row.GetCell(column).StringCellValue.Trim(); + } + catch (Exception e1) + { + v = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss"); + } + if (v != "") + { + try + { + obj = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss"); + + } + catch (Exception e2) + { + obj = Convert.ToDateTime(v).ToString("yyyy-MM-dd hh:mm:ss"); + } + } + else + obj = DBNull.Value; + + } + else if (datatype == NpoiDataType.Numeric) + { + obj = DBNull.Value; + try + { + //if (row.GetCell(column).StringCellValue != "") + obj = row.GetCell(column).NumericCellValue; + } + catch (Exception e3) + { + obj = row.GetCell(column).StringCellValue.Trim(); + } + + } + else + { + if (obj != null) + { + obj = obj.ToString().Trim().Replace("\n", "");//鍘绘帀鍥炶溅锛宭igerui tree涓嶆敮鎸佸洖杞� + if (obj.ToString().StartsWith(".")) + { + + decimal.Parse("0" + obj.ToString()); + obj = "0" + obj.ToString(); + } + } + } + return obj; + } + + private object GetCellData_double(NpoiDataType datatype, IRow row, int column) + { + return (object)(row.GetCell(column).NumericCellValue) ?? null; + } + #endregion + + #region 鑾峰彇鍗曞厓鏍兼暟鎹被鍨� + /// <summary> + /// 鑾峰彇鍗曞厓鏍兼暟鎹被鍨� + /// </summary> + /// <param name="hs"></param> + /// <returns></returns> + private NpoiDataType GetCellDataType(ICell hs) + { + NpoiDataType dtype; + DateTime t1; + string cellvalue = ""; + + switch (hs.CellType) + { + case CellType.Blank: + dtype = NpoiDataType.String; + cellvalue = hs.StringCellValue; + break; + case CellType.Boolean: + dtype = NpoiDataType.Bool; + break; + case CellType.Numeric: + dtype = NpoiDataType.String; + if (hs.NumericCellValue.ToString().Contains("-") || hs.NumericCellValue.ToString().Contains("/") || hs.ToString().Contains("-") || hs.ToString().Contains("/")) + { + hs.DateCellValue.ToString(); + dtype = NpoiDataType.Datetime; + } + cellvalue = hs.NumericCellValue.ToString(); + break; + case CellType.String: + dtype = NpoiDataType.String; + cellvalue = hs.StringCellValue; + break; + case CellType.Error: + dtype = NpoiDataType.Error; + break; + case CellType.Formula: + { + dtype = NpoiDataType.String; + try + { + if (hs.CachedFormulaResultType == CellType.Numeric && hs.NumericCellValue.ToString() != "") + { + dtype = NpoiDataType.Numeric; + cellvalue = hs.NumericCellValue.ToString(); + } + else if (hs.CachedFormulaResultType == CellType.Numeric && hs.DateCellValue.ToString() != "") + { + dtype = NpoiDataType.Datetime; + cellvalue = hs.DateCellValue.ToString(); + } + else if (hs.RichStringCellValue.ToString() != "") + { + dtype = NpoiDataType.String; + cellvalue = hs.RichStringCellValue.ToString(); + } + } + catch + { + try + { + if (hs.CachedFormulaResultType == CellType.Numeric && hs.NumericCellValue.ToString() != "") + { + dtype = NpoiDataType.Numeric; + cellvalue = hs.NumericCellValue.ToString(); + } + } + catch + { + //cellvalue = hs.StringCellValue; + } + } + + break; + } + default: + dtype = NpoiDataType.Datetime; + break; + } + //if (cellvalue != "" && DateTime.TryParse(cellvalue, out t1)) dtype = NpoiDataType.Datetime; + return dtype; + } + #endregion + + + #region 娴嬭瘯浠g爜 + + + #endregion + + + public DataSet ReadExcel_ByColNum(string FileName, int startRow, int LastCellNum, params NpoiDataType[] ColumnDataType) + { + string colNamePix = "F"; + int ertime = 0; + int intime = 0; + DataSet ds = new DataSet("ds"); + DataTable dt = new DataTable("dt"); + DataRow dr; + StringBuilder sb = new StringBuilder(); + using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read)) + { + IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡 + ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet + int j; + IRow row; + #region ColumnDataType璧嬪�� + if (ColumnDataType.Length <= 0) + { + row = sheet.GetRow(startRow - 1);//寰楀埌绗琲琛� + ColumnDataType = new NpoiDataType[LastCellNum]; + for (int i = 0; i < LastCellNum; i++) + { + ICell hs = row.GetCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK); + ColumnDataType[i] = GetCellDataType(hs); //NpoiDataType.Blank; + } + } + #endregion + for (j = 0; j < ColumnDataType.Length; j++) + { + Type tp = GetDataTableType(ColumnDataType[j]); + dt.Columns.Add(colNamePix + j, tp); + } + + ReadExcelEndRow = ReadExcelEndRow == 0 ? sheet.PhysicalNumberOfRows : ReadExcelEndRow; + int ss = sheet.LastRowNum + 1; + if (ReadExcelEndRow < ss && ReadExcelEndRow > 0) + { + ReadExcelEndRow = ss; + } + for (int i = startRow - 1; i <= ReadExcelEndRow; i++) + { + row = sheet.GetRow(i);//寰楀埌绗琲琛� + if (row == null) continue; + try + { + dr = dt.NewRow(); + + for (j = 0; j < ColumnDataType.Length; j++) + { + dr[colNamePix + (j)] = GetCellData(ColumnDataType[j], row, j); + } + dt.Rows.Add(dr); + intime++; + } + catch (Exception er) + { + ertime++; + sb.Append(string.Format("绗瑊0}琛屽嚭閿欙細{1}\r\n", i + 1, er.Message)); + continue; + } + } + ds.Tables.Add(dt); + } + if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString()); + return ds; + } + + } + + #region 鏋氫妇(Excel鍗曞厓鏍兼暟鎹被鍨�) + /// <summary> + /// 鏋氫妇(Excel鍗曞厓鏍兼暟鎹被鍨�) + /// </summary> + public enum NpoiDataType + { + /// <summary> + /// 瀛楃涓茬被鍨�-鍊间负1 + /// </summary> + String, + /// <summary> + /// 甯冨皵绫诲瀷-鍊间负2 + /// </summary> + Bool, + /// <summary> + /// 鏃堕棿绫诲瀷-鍊间负3 + /// </summary> + Datetime, + /// <summary> + /// 鏁板瓧绫诲瀷-鍊间负4 + /// </summary> + Numeric, + /// <summary> + /// 澶嶆潅鏂囨湰绫诲瀷-鍊间负5 + /// </summary> + Richtext, + /// <summary> + /// 绌虹櫧 + /// </summary> + Blank, + /// <summary> + /// 閿欒 + /// </summary> + Error + } + #endregion + +} \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index e0c7b1e..8aca390 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -22,6 +22,8 @@ <TargetFrameworkProfile /> <Use64BitIISExpress /> <UseGlobalApplicationHostFile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -53,6 +55,12 @@ </Reference> <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath> + </Reference> + <Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL"> + <HintPath>..\packages\Grpc.Core.2.45.0\lib\net45\Grpc.Core.dll</HintPath> + </Reference> + <Reference Include="Grpc.Core.Api, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL"> + <HintPath>..\packages\Grpc.Core.Api.2.45.0\lib\net45\Grpc.Core.Api.dll</HintPath> </Reference> <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"> <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath> @@ -87,6 +95,9 @@ <HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath> + </Reference> <Reference Include="System.Data.DataSetExtensions"> <Private>True</Private> </Reference> @@ -94,11 +105,17 @@ <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath> + </Reference> <Reference Include="System.Net.Http"> <Private>True</Private> </Reference> <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath> + </Reference> + <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath> </Reference> <Reference Include="System.Runtime.Serialization"> <Private>True</Private> @@ -364,6 +381,8 @@ <Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_ComplementGoodsController.cs" /> <Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" /> + <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormImportController.cs" /> + <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱NpoiHelper.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkBillSortBillController.cs" /> @@ -804,6 +823,7 @@ <Folder Include="Views\Gy_EquipType\" /> <Folder Include="Views\Gy_ICBomBill\" /> <Folder Include="Views\Gy_RoutingGroup\" /> + <Folder Include="Views\JIT_DayPlanPlatFormImport\" /> <Folder Include="Views\KF_ICInventoryList_WMSBill\" /> <Folder Include="Views\Kf_ICStockBillMain\" /> <Folder Include="Views\Kf_ICStockInOutBill\" /> @@ -914,6 +934,13 @@ </FlavorProperties> </VisualStudio> </ProjectExtensions> + <Import Project="..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets')" /> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>杩欏彴璁$畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets'))" /> + </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> diff --git a/WebAPI/packages.config b/WebAPI/packages.config index d3c9a5a..185dd60 100644 --- a/WebAPI/packages.config +++ b/WebAPI/packages.config @@ -3,6 +3,8 @@ <package id="Antlr" version="3.4.1.9004" targetFramework="net45" /> <package id="bootstrap" version="3.0.0" targetFramework="net45" /> <package id="Dapper" version="1.50.2" targetFramework="net45" /> + <package id="Grpc.Core" version="2.45.0" targetFramework="net45" /> + <package id="Grpc.Core.Api" version="2.45.0" targetFramework="net45" /> <package id="jQuery" version="1.10.2" targetFramework="net45" /> <package id="jQuery.Validation" version="1.11.1" targetFramework="net45" /> <package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net45" /> @@ -28,7 +30,10 @@ <package id="SharpZipLib" version="1.3.2" targetFramework="net45" /> <package id="Swashbuckle" version="5.0.0" targetFramework="net45" /> <package id="Swashbuckle.Core" version="5.0.0" targetFramework="net45" /> + <package id="System.Buffers" version="4.4.0" targetFramework="net45" /> <package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" /> + <package id="System.Memory" version="4.5.3" targetFramework="net45" /> + <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net45" /> <package id="WebActivatorEx" version="2.0.6" targetFramework="net45" /> <package id="WebGrease" version="1.5.2" targetFramework="net45" /> </packages> \ No newline at end of file -- Gitblit v1.9.1