From 1e5ff873b4f05e2932ff1d117f8e6241161096f0 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 14 七月 2022 09:46:06 +0800
Subject: [PATCH] nothing

---
 WindowsFormsApp1/App.config                      |    4 
 WebAPI/Web.config                                |  102 +-
 WebAPI/packages.config                           |   13 
 WebAPI/Controllers/POOrderBillExcelController.cs |  299 ++++++++
 WebAPI/Config/kdapi.config                       |    6 
 WebAPI/Controllers/POInStockController.cs        |  366 +++++++++
 WebAPI/WebAPI.csproj                             |   24 
 WebAPI/Controllers/NpoiHelper.cs                 | 1339 +++++++++++++++++++++++++++++++++++++
 8 files changed, 2,075 insertions(+), 78 deletions(-)

diff --git a/WebAPI/Config/kdapi.config b/WebAPI/Config/kdapi.config
index 4610af2..0d533d0 100644
--- a/WebAPI/Config/kdapi.config
+++ b/WebAPI/Config/kdapi.config
@@ -1,10 +1,10 @@
 锘�<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<appSettings>
-		<add key="DbId" value="5f9258a311401c"></add>
+		<add key="DbId" value="6204a70eba35fc"></add>
 		<add key="UserName" value="Administrator"></add>
 		<add key="PassWord" value="qaz!@#123"></add>
-		<add key="KDApiUrl" value="http://localhost/K3Cloud/"></add>
-		<add key="DataBaseName" value="http://localhost/K3Cloud/"></add>
+		<add key="KDApiUrl" value="http://47.96.97.237/k3cloud/"></add>
+		<add key="DataBaseName" value="AIS20210811135644"></add>
 	</appSettings>
 </configuration>
\ No newline at end of file
diff --git a/WebAPI/Controllers/NpoiHelper.cs b/WebAPI/Controllers/NpoiHelper.cs
new file mode 100644
index 0000000..354a5c6
--- /dev/null
+++ b/WebAPI/Controllers/NpoiHelper.cs
@@ -0,0 +1,1339 @@
+锘縰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
+{
+    /// <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>
+        /// <param name="numType">鑾峰彇鏁版嵁绨跨殑绫诲瀷</param>
+        /// <param name="name">宸ヤ綔绨跨殑鍚嶅瓧</param>
+        /// <returns></returns>
+        public DataSet ReadExcel(string FileName, int startRow,int numType,string name, 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 = 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璧嬪��
+                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/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index e11572c..f3d1c6e 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -13,6 +13,8 @@
 using System.Web.Http;
 using WebAPI.Code;
 using WebAPI.Models;
+using WebAPI.Utility;
+
 namespace WebAPI.Controllers
 {
     public class POInStockController : ApiController
@@ -627,11 +629,329 @@
                     objjson.data = null;
                     return objjson;
                 }
+                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+                string sql = string.Empty;
+                DataTable dt = new DataTable();
+                List<string> fidList = new List<string>();
+                if (FCusName == "鐟炰笌绁�")
+                {
+                    sql = string.Format(@"
+SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
+,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
+E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
+,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
+FROM CG_POINSTOCKBILLSUB B  
+JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
+JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
+LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
+LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
+JOIN {0}..T_PUR_POORDERENTRY_D CD ON    C.FENTRYID = CD.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
+JOIN {0}..T_PUR_POORDERENTRY_F CR ON    C.FENTRYID = CR.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
+LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
+LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
+LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID
+LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
+LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
+JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
+LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
+ WHERE b.hinterid in ({1}) and M.HERPInterID = 0
+", kdTbaleName, HInterID);
+                    //LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
 
-                //string kdTbaleName = "AIS20211209082932";
-                string kdTbaleName = "AIS20211130140219";//澶忓疂姝e紡
+                    dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+                    if (dt.Rows.Count > 0)
+                    {
+                        foreach (DataRow dr in dt.Rows)
+                        {
+                            if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
+                                continue;
+                            else
+                                fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
 
-                string sql = string.Format(@"
+                            DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
+
+                            JObject model = new JObject();
+                            string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
+                            string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
+                            if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+                            {
+                                fTypeName = "SLD03_SYS";
+                                ywTypeName = "WW";
+                            }
+                            if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
+                            {
+                                fTypeName = "SLD04_SYS";
+                                ywTypeName = "ZCCG";
+                            }
+                            model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
+                            model.Add("FBusinessType", ywTypeName); //涓氬姟绫诲瀷
+                            model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁缂栧彿
+                            model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
+                            model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 鏀舵枡缁勭粐 
+                            model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //閲囪喘缁勭粐
+                            model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //渚涘簲鍟�
+                            model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //閲囪喘鍛�
+                                                                                                                          //model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //鏀舵枡鍛�
+                            model.Add("FOwnerTypeIdHead", "BD_Supplier");//  璐т富绫诲瀷
+                            model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//璐т富 渚涘簲鍟� 
+                                                                                                                        //model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//鏄惁鏈夌エ 
+                            JArray Fentity = new JArray();
+                            foreach (var item in drs)
+                            {
+                                JObject FentityModel = new JObject();
+                                FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 鐗╂枡缂栫爜   
+                                FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 鍗曚綅   
+                                FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡   
+                                FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅   
+                                FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); //  搴撳瓨鍗曚綅   
+                                FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
+                                FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//璐т富绫诲瀷
+                                FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富 
+                                FentityModel.Add("FSrcId", item["FID"].ToString());//婧愬崟鍐呯爜
+                                FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//婧愬崟绫诲瀷
+                                FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+                                FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+                                FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+                                FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+                                FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
+                                FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
+                                FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+                                FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+
+                                JArray Fentity2 = new JArray();
+                                JObject FentityModel2 = new JObject();
+                                FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
+                                FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
+                                FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
+                                FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
+                                Fentity2.Add(FentityModel2);
+                                FentityModel.Add("FDetailEntity_Link", Fentity2);
+                                Fentity.Add(FentityModel);
+                            }
+                            model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+
+                            JObject _FentityModel = new JObject();
+                            _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); //  缁撶畻缁勭粐  
+                            _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); //  缁撶畻甯佸埆
+                            _FentityModel.Add("FPricePoint", 0); //  瀹氫环鏃剁偣
+                            model.Add("FinanceEntity ", _FentityModel);//璐㈠姟淇℃伅
+                            JObject jsonRoot = new JObject()
+                            {
+                                ["Creator"] = "",
+                                ["NeedUpDateFields"] = new JArray(),
+                                ["NeedReturnFields"] = new JArray(),
+                                ["IsDeleteEntry"] = "false",
+                                ["SubSystemId"] = "",
+                                ["IsVerifyBaseDataField"] = "false",
+                                ["Model"] = model
+                            };
+                            var loginRet = InvokeHelper.Login();
+                            var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+                            if (isSuccess == 0)
+                            {
+                                objjson.code = "0";
+                                objjson.count = 0;
+                                objjson.Message = loginRet;
+                                objjson.data = null;
+                                return objjson;
+                            }
+                            LogService.Write("jsonRoot:" + jsonRoot.ToString());
+                            var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
+                            //LogService.Write(result);
+                            if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
+                            {
+                                //鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
+                                string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+                                string FID = JObject.Parse(result)["Result"]["Id"].ToString();
+
+                                string updateSql = string.Format(@"
+                                                      update a set 
+                                                      a.HERPInterID = {0} ,
+                                                      a.HERPBillNO   ='{1}'
+                                                      from Cg_POInStockBillMain a
+                                                      join Cg_POInStockBillSub b on a.hinterid = b.hinterid
+                                                      where b.HInterID = ({2})
+                                                      and b. HSOURCEINTERID = {3}
+                                                      and a.HERPInterID = 0
+                                                     ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
+                                oCn.RunProc(updateSql);
+                            }
+                            else
+                            {
+                                objjson.code = "0";
+                                objjson.count = 0;
+                                objjson.Message = result;
+                                objjson.data = null;
+                                return objjson;
+                            }
+                        }
+                    }
+                }
+                else if (FCusName == "")
+                {
+                    sql = string.Format(@"
+SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
+,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
+E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
+,CU.FNUMBER AS FUNITNUMBER,'' F_XBKF_COMBO1,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER,'' F_XBKF_BASE1,'' AS FRECEIVEMENNUMBER
+FROM CG_POINSTOCKBILLSUB B  
+JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
+JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
+LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
+LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
+JOIN {0}..T_PUR_POORDERENTRY_D CD ON    C.FENTRYID = CD.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
+JOIN {0}..T_PUR_POORDERENTRY_F CR ON    C.FENTRYID = CR.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
+LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
+LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
+LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID
+LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
+LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
+JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
+LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
+ WHERE b.hinterid in ({1}) and M.HERPInterID = 0
+", kdTbaleName, HInterID);
+                    //LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
+
+                    dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+                    if (dt.Rows.Count > 0)
+                    {
+                        foreach (DataRow dr in dt.Rows)
+                        {
+                            if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
+                                continue;
+                            else
+                                fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
+
+                            DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
+
+                            JObject model = new JObject();
+                            string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
+                            string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
+                            if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+                            {
+                                fTypeName = "SLD03_SYS";
+                                ywTypeName = "WW";
+                            }
+                            if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
+                            {
+                                fTypeName = "SLD04_SYS";
+                                ywTypeName = "ZCCG";
+                            }
+                            model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
+                            model.Add("FBusinessType", ywTypeName); //涓氬姟绫诲瀷
+                            model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁缂栧彿
+                            model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
+                            model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 鏀舵枡缁勭粐 
+                            model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //閲囪喘缁勭粐
+                            model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //渚涘簲鍟�
+                            model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //閲囪喘鍛�
+                            model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //鏀舵枡鍛�
+                            model.Add("FOwnerTypeIdHead", "BD_Supplier");//  璐т富绫诲瀷
+                            model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//璐т富 渚涘簲鍟� 
+                            model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//鏄惁鏈夌エ 
+                            JArray Fentity = new JArray();
+                            foreach (var item in drs)
+                            {
+                                JObject FentityModel = new JObject();
+                                FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 鐗╂枡缂栫爜   
+                                FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 鍗曚綅   
+                                FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡   
+                                FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅   
+                                FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); //  搴撳瓨鍗曚綅   
+                                FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
+                                FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//璐т富绫诲瀷
+                                FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富 
+                                FentityModel.Add("FSrcId", item["FID"].ToString());//婧愬崟鍐呯爜
+                                FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//婧愬崟绫诲瀷
+                                FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+                                FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+                                FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+                                FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+                                FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
+                                FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
+                                FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+                                FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+
+                                JArray Fentity2 = new JArray();
+                                JObject FentityModel2 = new JObject();
+                                FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
+                                FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
+                                FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
+                                FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
+                                Fentity2.Add(FentityModel2);
+                                FentityModel.Add("FDetailEntity_Link", Fentity2);
+                                Fentity.Add(FentityModel);
+                            }
+                            model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+
+                            JObject _FentityModel = new JObject();
+                            _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); //  缁撶畻缁勭粐  
+                            _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); //  缁撶畻甯佸埆
+                            _FentityModel.Add("FPricePoint", 0); //  瀹氫环鏃剁偣
+                            model.Add("FinanceEntity ", _FentityModel);//璐㈠姟淇℃伅
+                            JObject jsonRoot = new JObject()
+                            {
+                                ["Creator"] = "",
+                                ["NeedUpDateFields"] = new JArray(),
+                                ["NeedReturnFields"] = new JArray(),
+                                ["IsDeleteEntry"] = "false",
+                                ["SubSystemId"] = "",
+                                ["IsVerifyBaseDataField"] = "false",
+                                ["Model"] = model
+                            };
+                            var loginRet = InvokeHelper.Login();
+                            var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+                            if (isSuccess == 0)
+                            {
+                                objjson.code = "0";
+                                objjson.count = 0;
+                                objjson.Message = loginRet;
+                                objjson.data = null;
+                                return objjson;
+                            }
+                            LogService.Write("jsonRoot:" + jsonRoot.ToString());
+                            var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
+                            //LogService.Write(result);
+                            if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
+                            {
+                                //鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
+                                string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+                                string FID = JObject.Parse(result)["Result"]["Id"].ToString();
+
+                                string updateSql = string.Format(@"
+                                                      update a set 
+                                                      a.HERPInterID = {0} ,
+                                                      a.HERPBillNO   ='{1}'
+                                                      from Cg_POInStockBillMain a
+                                                      join Cg_POInStockBillSub b on a.hinterid = b.hinterid
+                                                      where b.HInterID = ({2})
+                                                      and b. HSOURCEINTERID = {3}
+                                                      and a.HERPInterID = 0
+                                                     ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
+                                oCn.RunProc(updateSql);
+                            }
+                            else
+                            {
+                                objjson.code = "0";
+                                objjson.count = 0;
+                                objjson.Message = result;
+                                objjson.data = null;
+                                return objjson;
+                            }
+                        }
+
+                    }
+                }
+                else
+                {
+                    sql = string.Format(@"
 SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
 ,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
 E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
@@ -656,8 +976,9 @@
 LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
  WHERE b.hinterid in ({1}) and M.HERPInterID = 0
 ", kdTbaleName, HInterID);
-                DataTable dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
-                List<string> fidList = new List<string>();
+                }
+                dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+                fidList = new List<string>();
                 if (dt.Rows.Count > 0)
                 {
                     foreach (DataRow dr in dt.Rows)
@@ -885,11 +1206,15 @@
         //瀹℃牳 鍒犻櫎 鍒犻櫎閲戣澏鏁版嵁搴撳搴� 鏀舵枡閫氱煡鍒版暟鎹�
         public json DeleteKingDee(string hinterid)
         {
+            var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
             string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
             string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
             if (FCusName == "澶忓疂鐢靛櫒")
-                sql = "select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join AIS20211130140219..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
+                sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
+            else if (FCusName.Contains("鐟炰笌绁�"))
+                sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
             DataTable dt = oCN.RunProcReturn(sql, "deleteDt").Tables[0];
             if (dt.Rows.Count > 0)
             {
@@ -1017,14 +1342,14 @@
             List<string> mylist = new List<string>(ids.Split(',').Distinct());
             List<string> entryList = new List<string>(entryids.Split(',').Distinct());
             SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
-            if (mylist.Count > 1)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "鎿嶄綔澶辫触锛佽閫夋嫨鐩稿悓閲囪喘璁㈠崟鏁版嵁琛屼笅鎺紒";
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
+            //if (mylist.Count > 1)
+            //{
+            //    objJsonResult.code = "0";
+            //    objJsonResult.count = 0;
+            //    objJsonResult.Message = "鎿嶄綔澶辫触锛佽閫夋嫨鐩稿悓閲囪喘璁㈠崟鏁版嵁琛屼笅鎺紒";
+            //    objJsonResult.data = null;
+            //    return objJsonResult;
+            //}
             try
             {
                 //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
@@ -1079,16 +1404,17 @@
             SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
             try
             {
+                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
                 //楠岃瘉閲戣澏閲囪喘璁㈠崟鏄惁瀛樺湪
                 string sql = string.Format(@"
 select M.HBillNo,B.HMaterID,E.HNumber,E.HName 
 FROM Cg_POOrderBillSub B  
 JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
 JOIN Gy_Material E ON B.HMaterID = E.HItemID
-LEFT JOIN AIS20211130140219..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+LEFT JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
 WHERE ISNULL(C.FENTRYID,0) = 0
 AND B.HEntryID in ({0})"
-, entryids);
+, entryids, kdTbaleName);
                 DataSet ds = oCn.RunProcReturn(sql, "temp");
                 if (ds.Tables[0].Rows.Count > 0)
                 {
@@ -1105,12 +1431,12 @@
 FROM Cg_POOrderBillSub B  
 JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
 JOIN Gy_Material E ON B.HMaterID = E.HItemID
-JOIN AIS20211130140219..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
-LEFT join AIS20211130140219..T_PUR_POCHANGEENTRY D ON C.FENTRYID = D.FOFENTRYID
-LEFT join AIS20211130140219..T_PUR_POCHANGE F ON D.FID = F.FID
+JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+LEFT join {1}..T_PUR_POCHANGEENTRY D ON C.FENTRYID = D.FOFENTRYID
+LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID
 where b.HEntryID in ({0})
 and F.FDOCUMENTSTATUS <> 'C'"
-, entryids);
+, entryids, kdTbaleName);
                 ds = oCn.RunProcReturn(sql, "temp");
                 if (ds.Tables[0].Rows.Count > 0)
                 {
diff --git a/WebAPI/Controllers/POOrderBillExcelController.cs b/WebAPI/Controllers/POOrderBillExcelController.cs
new file mode 100644
index 0000000..8f6aabd
--- /dev/null
+++ b/WebAPI/Controllers/POOrderBillExcelController.cs
@@ -0,0 +1,299 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Code;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+    public class POOrderBillExcelController : ApiController
+    {
+        private JsonResult objJsonResult = new JsonResult();
+        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+
+        #region 閲囪喘璁㈠崟 鏌ヨ
+        [Route("POOrderBillExcel/POOrderBillExcelList")]
+        [HttpGet]
+        public object POOrderBillExcelList(string sqlWhere)
+        {
+            DataSet ds = new DataSet();
+            DataSet ds1 = new DataSet();
+            DataTable dt = new DataTable();
+            try
+            {
+                ds = oCn.RunProcReturn("select * from POOrderBill_Excel ", "POOrderBill_Excel");
+
+                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+                {
+                    ds1 = oCn.RunProcReturn($"exec h_p_POOrderBill_Excel {ds.Tables[0].Rows[i]["HQty"].ToString()},'{ds.Tables[0].Rows[i]["MaterialNum"].ToString()}','1'", "POOrderBill_Excel");
+
+                    if (i == 0)
+                    {
+                        dt = ds1.Tables[0];
+                    }
+                    else
+                    {
+                        foreach (DataRow item in ds1.Tables[0].Rows)
+                        {
+                            DataRow dataRow = dt.NewRow();
+                            dataRow.ItemArray = item.ItemArray;
+                            dt.Rows.Add(dataRow);
+                        }
+                    }
+
+                }
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "";
+                objJsonResult.data = dt;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鑾峰彇澶辫触" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+        }
+        #endregion
+
+        #region 閲囪喘璁㈠崟 鏂囦欢涓婁紶
+        [Route("POOrderBillExcel/POOrderBillExcelImport")]
+        [HttpPost]
+        public object POOrderBillExcelImport()
+        {
+            try
+            {
+                //鑾峰彇鏂囦欢鍚嶇О
+                var file = HttpContext.Current.Request.Files[0];
+                //鑾峰彇鏂囦欢鐗╃悊璺緞
+                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+                //淇濆瓨鏂囦欢
+                file.SaveAs(ExcelPath);
+
+                NpoiHelper np = new NpoiHelper();
+                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "2");
+
+                //鍒犻櫎鏂囦欢
+                File.Delete(ExcelPath);
+
+                //鍒涘缓涓存椂琛�
+                DataTable tb2 = new DataTable("dt2");
+
+                //娣诲姞鍒楀悕
+                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+                {
+                    tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+                }
+
+                //娣诲姞鏁版嵁
+                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+                {
+                    DataRow row = tb2.NewRow();
+                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+                    {
+                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+                    }
+                    tb2.Rows.Add(row);
+                }
+
+
+                var error = "";
+
+                //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
+                if (!tb2.Columns.Contains("缁勭粐"))
+                    error += "娌℃湁鎵惧埌銆愮粍缁囥�戠殑鏍囬,";
+
+                if (!tb2.Columns.Contains("渚涘簲鍟�"))
+                    error += "娌℃湁鎵惧埌銆愪緵搴斿晢銆戠殑鏍囬,";
+
+                if (!tb2.Columns.Contains("鏀舵枡浠撳簱"))
+                    error += "娌℃湁鎵惧埌銆愭敹鏂欎粨搴撱�戠殑鏍囬,";
+
+                if (!tb2.Columns.Contains("鐗╂枡缂栫爜"))
+                    error += "娌℃湁鎵惧埌銆愮墿鏂欑紪鐮併�戠殑鏍囬,";
+
+                if (!tb2.Columns.Contains("鏁伴噺"))
+                    error += "娌℃湁鎵惧埌銆愭暟閲忋�戠殑鏍囬,";
+
+                if (!tb2.Columns.Contains("鍖呰鏍囪瘑"))
+                    error += "娌℃湁鎵惧埌銆愬寘瑁呮爣璇嗐�戠殑鏍囬,";
+
+                if (error.Length > 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鍒ゆ柇鏁版嵁鏄惁涓虹┖
+                for (int i = 0; i < tb2.Rows.Count; i++)
+                {
+                    for (int j = 0; j < tb2.Columns.Count; j++)
+                    {
+                        if (tb2.Rows[i][j].ToString() == ""&& tb2.Columns[i].ToString()!= "鍖呰鏍囪瘑")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,绗瑊(i + 1)}琛岀{(j + 1)}鍒楀�间笉鑳戒负绌�!\r\n";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+
+                //妫�鏌ョ墿鏂� 鏄惁瀛樺湪
+                objJsonResult = (JsonResult)Checkdata(tb2);
+                if (objJsonResult.code == "0")
+                {
+                    return objJsonResult;
+                }
+                else
+                {
+                    oCn.RunProc("delete from POOrderBill_Excel");
+                    for (int i = 0; i < tb2.Rows.Count; i++)
+                    {
+                        oCn.RunProc("insert into POOrderBill_Excel(HItemID,HORGName, SupplierName, Warehouse_Shou," +
+                            " MaterialNum, HQty, HPackFlag)values" +
+                            $"({(i + 1)},'{tb2.Rows[i]["缁勭粐"].ToString()}', '{tb2.Rows[i]["渚涘簲鍟�"].ToString()}', '{tb2.Rows[i]["鏀舵枡浠撳簱"].ToString()}', " +
+                            $"'{tb2.Rows[i]["鐗╂枡缂栫爜"].ToString()}', {tb2.Rows[i]["鏁伴噺"].ToString()}, '{tb2.Rows[i]["鍖呰鏍囪瘑"].ToString()}')");
+                    }
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = error;
+                    objJsonResult.data = tb2;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        //妫�鏌ョ墿鏂� 鏄惁瀛樺湪
+        private object Checkdata(DataTable dt)
+        {
+            DataSet ds = new DataSet();
+            for (int i = 0; i < dt.Rows.Count; i++)
+            {
+                //缁勭粐
+                ds = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS where Hname='" + dt.Rows[i]["缁勭粐"].ToString() + "' ", "Xt_ORGANIZATIONS");
+                if (ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = $"绗瑊(i + 1)}琛�,缁勭粐涓簕dt.Rows[i]["缁勭粐"].ToString()}涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //渚涘簲鍟�
+                ds = oCn.RunProcReturn("select * from Gy_Supplier where Hname='" + dt.Rows[i]["渚涘簲鍟�"].ToString() + "' ", "Gy_Supplier");
+                if (ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = $"绗瑊(i + 1)}琛�,渚涘簲鍟嗕负{dt.Rows[i]["渚涘簲鍟�"].ToString()}涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鏀舵枡浠撳簱
+                ds = oCn.RunProcReturn("select * from Gy_Warehouse where Hname='" + dt.Rows[i]["鏀舵枡浠撳簱"].ToString() + "' ", "Gy_Warehouse");
+                if (ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = $"绗瑊(i + 1)}琛�,鏀舵枡浠撳簱涓簕dt.Rows[i]["鏀舵枡浠撳簱"].ToString()}涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鐗╂枡缂栫爜
+                if (!DBUtility.ClsPub.AllowNumber(dt.Rows[i]["鐗╂枡缂栫爜"].ToString()))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鐗╂枡浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                ds = oCn.RunProcReturn("select * from Gy_Material where HNumber='" + dt.Rows[i]["鐗╂枡缂栫爜"].ToString() + "' ", "Gy_Material");
+                if (ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = $"绗瑊(i + 1)}琛�,鐗╂枡缂栫爜涓簕dt.Rows[i]["鐗╂枡缂栫爜"].ToString()}涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鏁伴噺
+                if (dt.Rows[i]["鏁伴噺"].ToString() == "0")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = $"绗瑊(i + 1)}琛�,鏁伴噺涓嶄负0!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鍒ゆ柇瀵煎叆鐗╂枡鐨勬暟閲忔槸鍚﹀ぇ浜庡崟鎹墿鏂欑殑鎬诲拰鏁伴噺
+                ds = oCn.RunProcReturn("select * from h_v_POOrderBill_Excel " +
+                    $"where 閲囪喘缁勭粐='{dt.Rows[i]["缁勭粐"].ToString()}' and 渚涘簲鍟�='{dt.Rows[i]["渚涘簲鍟�"].ToString()}' " +
+                    $"and 鍖呰鏍囪瘑='{dt.Rows[i]["鍖呰鏍囪瘑"].ToString()}'" +
+                    $"and 鐗╂枡缂栫爜='{dt.Rows[i]["鐗╂枡缂栫爜"].ToString()}' and 鍏抽棴鐘舵��='鏈叧闂�' ", "h_v_POOrderBill_Excel");
+                if (ds.Tables[0].Rows.Count != 0)
+                {
+                    double NumCount = 0;//鎬绘暟閲�
+                    foreach (DataRow item in ds.Tables[0].Rows)
+                    {
+                        NumCount += double.Parse(item["鏈叧鑱旀暟閲�"].ToString());
+                    }
+
+                    if (NumCount < double.Parse(dt.Rows[i]["鏁伴噺"].ToString()))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = $"绗瑊(i + 1)}琛屽鍏ユ暟閲忓ぇ浜庨噰璐鍗曞悎璁℃暟閲�,璇锋壘閲囪喘鍛樼敵璇峰仛閲囪喘璁㈠崟!";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = $"绗瑊(i + 1)}琛�,鍖归厤涓嶅埌鏁版嵁淇℃伅!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+
+            objJsonResult.code = "1";
+            objJsonResult.count = 1;
+            objJsonResult.Message = "娌℃湁闂";
+            objJsonResult.data = null;
+            return objJsonResult;
+        }
+        #endregion
+
+
+    }
+}
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index e3008c4..9933181 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -4,8 +4,8 @@
   http://go.microsoft.com/fwlink/?LinkId=301879
   -->
 <configuration>
-  <appSettings />
-  <!--
+	<appSettings />
+	<!--
     鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
 
     鍙湪 <httpRuntime> 鏍囪涓婅缃互涓嬬壒鎬с��
@@ -13,51 +13,57 @@
         <httpRuntime targetFramework="4.5" />
       </system.Web>
   -->
-  <system.web>
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime />
-    <pages controlRenderingCompatibilityVersion="4.0" />
-  </system.web>
-  <system.webServer>
-    <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <!--<remove name="OPTIONSVerbHandler"/>-->
-      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-    </handlers>
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <!--<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+	<system.web>
+		<customErrors mode="Off" />
+	</system.web>
+	<system.webServer>
+		<httpErrors errorMode="Detailed" />
+	</system.webServer>
+	<system.web>
+		<compilation debug="true" targetFramework="4.5" />
+		<httpRuntime />
+		<pages controlRenderingCompatibilityVersion="4.0" />
+	</system.web>
+	<system.webServer>
+		<handlers>
+			<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+			<!--<remove name="OPTIONSVerbHandler"/>-->
+			<remove name="TRACEVerbHandler" />
+			<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+		</handlers>
+	</system.webServer>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="1.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<!--<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>-->
-		  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-		  <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
 </configuration>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 53b56f7..e2d02bb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -43,6 +43,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+    </Reference>
     <Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DAL.dll</HintPath>
@@ -50,6 +53,9 @@
     <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DBUtility.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.2.904.6, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -80,8 +86,8 @@
     <Reference Include="Microsoft.Owin.Cors, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Cors.4.2.0\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.2.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Security, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.2.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
@@ -97,6 +103,18 @@
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\WeChat Files\shenjie1112005\FileStorage\File\2019-12\webapi鎺ュ彛\FurjaFlatFormAPI\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OOXML, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OOXML.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -193,10 +211,12 @@
     <Compile Include="Code\Test2.cs" />
     <Compile Include="Code\TestDAL.cs" />
     <Compile Include="Controllers\BarCodeController.cs" />
+    <Compile Include="Controllers\NpoiHelper.cs" />
     <Compile Include="Controllers\POInStockBackController.cs" />
     <Compile Include="Controllers\POInStockController.cs" />
     <Compile Include="Controllers\PODemandPlanController.cs" />
     <Compile Include="Controllers\EntrustOrderController.cs" />
+    <Compile Include="Controllers\POOrderBillExcelController.cs" />
     <Compile Include="Controllers\POOrderController.cs" />
     <Compile Include="Controllers\PublicPageMethodController.cs" />
     <Compile Include="Controllers\ReportController.cs" />
diff --git a/WebAPI/packages.config b/WebAPI/packages.config
index 6321554..73e3bff 100644
--- a/WebAPI/packages.config
+++ b/WebAPI/packages.config
@@ -4,10 +4,10 @@
   <package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR" version="2.4.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.Core" version="2.4.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.SignalR.Core.zh-Hans" version="2.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.SignalR.Core.zh-Hans" version="2.4.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.JS" version="2.4.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.SystemWeb" version="2.4.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.SignalR.SystemWeb.zh-Hans" version="2.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.SignalR.SystemWeb.zh-Hans" version="2.4.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.zh-Hans" version="2.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
@@ -19,14 +19,17 @@
   <package id="Microsoft.Azure.AppService.ApiApps.Service" version="0.9.16" targetFramework="net45" />
   <package id="Microsoft.Owin" version="4.2.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Cors" version="4.2.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Host.SystemWeb" version="2.1.0" targetFramework="net45" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.SystemWeb.zh-Hans" version="4.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Security.zh-Hans" version="4.0.1" targetFramework="net45" />
-  <package id="Microsoft.Owin.zh-Hans" version="4.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.Security.zh-Hans" version="2.1.0" targetFramework="net45" />
+  <package id="Microsoft.Owin.zh-Hans" version="4.2.0" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
+  <package id="NPOI" version="2.5.6" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
+  <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net45" />
+  <package id="SharpZipLib" version="1.3.3" targetFramework="net45" />
   <package id="Swashbuckle" version="5.0.0" targetFramework="net45" />
   <package id="Swashbuckle.Core" version="5.0.0" targetFramework="net45" />
   <package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
diff --git a/WindowsFormsApp1/App.config b/WindowsFormsApp1/App.config
index 25316c1..796c2a5 100644
--- a/WindowsFormsApp1/App.config
+++ b/WindowsFormsApp1/App.config
@@ -21,6 +21,10 @@
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

--
Gitblit v1.9.1