Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2024-10-04 77a07f1ab62f339e6b89aa7667dbdcb789a03e43

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -12,8 +12,8 @@
using SyntacticSugar.constant;
using System.Web;
using WebAPI.Controllers.SCGL.日计划管理;
using WebAPI.WebBLL.JCJM.GYZL;
using WebAPI.WebBLL.JCJM.IMPL;
//using WebAPI.WebBLL.JCJM.GYZL;
//using WebAPI.WebBLL.JCJM.IMPL;
using System.IO;
namespace WebAPI.Controllers
{
@@ -25,7 +25,7 @@

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        private Gy_CustomerService customerService = new Gy_CustomerImpl();
        //private Gy_CustomerService customerService = new Gy_CustomerImpl();
        DataSet ds;

        #region 返回客户列表
@@ -1367,41 +1367,41 @@
        #endregion

        #region 客户列表 文件上传
        [Route("Gy_Customer/Gy_Process_Excel")]
        [HttpPost]
        public json Gy_Department_Excel()
        {
            json res = new json();
            try
            {
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);
        //[Route("Gy_Customer/Gy_Process_Excel")]
        //[HttpPost]
        //public json Gy_Department_Excel()
        //{
        //    json res = new json();
        //    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, "0");
                //删除文件
                File.Delete(ExcelPath);
                DataTable provisional = customerService.UploadExcel(ExcelDs);             
        //        NpoiHelper np = new NpoiHelper();
        //        DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
        //        //删除文件
        //        File.Delete(ExcelPath);
        //        DataTable provisional = customerService.UploadExcel(ExcelDs);             
                
                res.code = CodeConstant.SUCCEED;
                res.count = CountConstant.SUCCEED;
                res.Message = "上传成功";
                res.data = provisional;
                return res;
            }
            catch (Exception e)
            {
                res.code = "0";
                res.count = 0;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return res;
            }
        }
        //        res.code = CodeConstant.SUCCEED;
        //        res.count = CountConstant.SUCCEED;
        //        res.Message = "上传成功";
        //        res.data = provisional;
        //        return res;
        //    }
        //    catch (Exception e)
        //    {
        //        res.code = "0";
        //        res.count = 0;
        //        res.Message = "Exception！" + e.ToString();
        //        res.data = null;
        //        return res;
        //    }
        //}

        /// <summary>
        /// 判断当前职员是否存在
@@ -1409,15 +1409,15 @@
        /// <param name="HEmpNumber"></param>
        /// <param name="HEmpName"></param>
        /// <returns></returns>
        private bool JudgeEmp(string HEmpNumber, string HEmpName)
        {
            if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
            {
                DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
                return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
            }
            return false;
        }
        //private bool JudgeEmp(string HEmpNumber, string HEmpName)
        //{
        //    if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
        //    {
        //        DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
        //        return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
        //    }
        //    return false;
        //}

        /// <summary>
        /// 判断列

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -1166,95 +1166,95 @@
        #endregion

        #region 部门列表 文件上传
        [Route("Gy_Department/Gy_Process_Excel")]
        [HttpPost]
        public json Gy_Department_Excel()
        {
            json res = new json();
            try
            {
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);
        //[Route("Gy_Department/Gy_Process_Excel")]
        //[HttpPost]
        //public json Gy_Department_Excel()
        //{
        //    json res = new json();
        //    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, "0");
        //        NpoiHelper np = new NpoiHelper();
        //        DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

                //删除文件
                File.Delete(ExcelPath);
        //        //删除文件
        //        File.Delete(ExcelPath);

                //创建临时表
                DataTable provisional = new DataTable("dt2");
        //        //创建临时表
        //        DataTable provisional = new DataTable("dt2");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }
        //        //添加列名
        //        for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
        //        {
        //            provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
        //        }

                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = provisional.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    provisional.Rows.Add(row);
                }
        //        //添加数据
        //        for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
        //        {
        //            DataRow row = provisional.NewRow();
        //            for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
        //            {
        //                row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
        //            }
        //            provisional.Rows.Add(row);
        //        }

                //判断列
                string error = JudgmentColumns(provisional);
                if (error.Length > 0)
                {
                    res.code = "0";
                    res.count = 0;
                    res.Message = $"Excel模板存在错误,{error}\r\n";
                    res.data = null;
                    return res;
                }
        //        //判断列
        //        string error = JudgmentColumns(provisional);
        //        if (error.Length > 0)
        //        {
        //            res.code = "0";
        //            res.count = 0;
        //            res.Message = $"Excel模板存在错误,{error}\r\n";
        //            res.data = null;
        //            return res;
        //        }

                for (int i = 0; i <= provisional.Rows.Count - 1; i++)
                {
                    string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门代码"].ToString());
                    string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门名称"].ToString());
                    string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人代码"].ToString());
                    string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人名称"].ToString());
                    string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["条形码"].ToString());
                    string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
                    string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());
        //        for (int i = 0; i <= provisional.Rows.Count - 1; i++)
        //        {
        //            string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门代码"].ToString());
        //            string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门名称"].ToString());
        //            string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人代码"].ToString());
        //            string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人名称"].ToString());
        //            string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["条形码"].ToString());
        //            string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
        //            string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());

                    //判断负责人是否存在
                    if (JudgeEmp(HEmpNumber, HEmpName))
                    {
                        res.code = CodeConstant.FAIL;
                        res.count = CountConstant.FAIL;
                        res.Message = "当前职员不存在";
                        res.data = null;
                        return res;
                    }
                    //获取真实行数
                    int line = i + 1;
                }
        //            //判断负责人是否存在
        //            if (JudgeEmp(HEmpNumber, HEmpName))
        //            {
        //                res.code = CodeConstant.FAIL;
        //                res.count = CountConstant.FAIL;
        //                res.Message = "当前职员不存在";
        //                res.data = null;
        //                return res;
        //            }
        //            //获取真实行数
        //            int line = i + 1;
        //        }

                res.code = "1";
                res.count = 1;
                res.Message = error;
                res.data = provisional;
                return res;
            }
            catch (Exception e)
            {
                res.code = "0";
                res.count = 0;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return res;
            }
        }
        //        res.code = "1";
        //        res.count = 1;
        //        res.Message = error;
        //        res.data = provisional;
        //        return res;
        //    }
        //    catch (Exception e)
        //    {
        //        res.code = "0";
        //        res.count = 0;
        //        res.Message = "Exception！" + e.ToString();
        //        res.data = null;
        //        return res;
        //    }
        //}

        /// <summary>
        /// 判断当前职员是否存在
@@ -1262,15 +1262,15 @@
        /// <param name="HEmpNumber"></param>
        /// <param name="HEmpName"></param>
        /// <returns></returns>
        private bool JudgeEmp(string HEmpNumber, string HEmpName)
        {
            if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
            {
                DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
                return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
            }
            return false;
        }
        //private bool JudgeEmp(string HEmpNumber, string HEmpName)
        //{
        //    if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
        //    {
        //        DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
        //        return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
        //    }
        //    return false;
        //}

        /// <summary>
        /// 判断列

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -975,109 +975,109 @@
        #endregion

        #region 检验依据列表 文件上传
        [Route("Gy_Warehouse/Gy_Process_Excel")]
        [HttpPost]
        public json Gy_InspectBasis_Excel()
        {
            json res = new json();
            try
            {
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);
        //[Route("Gy_Warehouse/Gy_Process_Excel")]
        //[HttpPost]
        //public json Gy_InspectBasis_Excel()
        //{
        //    json res = new json();
        //    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, "0");
        //        NpoiHelper np = new NpoiHelper();
        //        DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

                //删除文件
                File.Delete(ExcelPath);
        //        //删除文件
        //        File.Delete(ExcelPath);

                //创建临时表
                DataTable provisional = new DataTable("dt2");
        //        //创建临时表
        //        DataTable provisional = new DataTable("dt2");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }
        //        //添加列名
        //        for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
        //        {
        //            provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
        //        }

                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = provisional.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    provisional.Rows.Add(row);
                }
        //        //添加数据
        //        for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
        //        {
        //            DataRow row = provisional.NewRow();
        //            for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
        //            {
        //                row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
        //            }
        //            provisional.Rows.Add(row);
        //        }

                //判断列
                string error = JudgmentColumns(provisional);
                if (error.Length > 0)
                {
                    res.code = "0";
                    res.count = 0;
                    res.Message = $"Excel模板存在错误,{error}\r\n";
                    res.data = null;
                    return res;
                }
        //        //判断列
        //        string error = JudgmentColumns(provisional);
        //        if (error.Length > 0)
        //        {
        //            res.code = "0";
        //            res.count = 0;
        //            res.Message = $"Excel模板存在错误,{error}\r\n";
        //            res.data = null;
        //            return res;
        //        }

                for (int i = 0; i <= provisional.Rows.Count - 1; i++)
                {
                    string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["仓库代码"].ToString());
                    string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["仓库名称"].ToString());
                    string phone = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["联系电话"].ToString());
                    string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["职员代码"].ToString());
                    string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["职员名称"].ToString());
                    string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
                    string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());
                    if(JudgeEmp(HEmpNumber, HEmpName))
                    {
                        res.code = CodeConstant.FAIL;
                        res.count = CountConstant.FAIL;
                        res.Message = "当前职员不存在";
                        res.data = null;
                        return res;
                    }
                    //获取真实行数
                    int line = i + 1;
                }
        //        for (int i = 0; i <= provisional.Rows.Count - 1; i++)
        //        {
        //            string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["仓库代码"].ToString());
        //            string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["仓库名称"].ToString());
        //            string phone = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["联系电话"].ToString());
        //            string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["职员代码"].ToString());
        //            string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["职员名称"].ToString());
        //            string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
        //            string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());
        //            if(JudgeEmp(HEmpNumber, HEmpName))
        //            {
        //                res.code = CodeConstant.FAIL;
        //                res.count = CountConstant.FAIL;
        //                res.Message = "当前职员不存在";
        //                res.data = null;
        //                return res;
        //            }
        //            //获取真实行数
        //            int line = i + 1;
        //        }

                res.code = "1";
                res.count = 1;
                res.Message = error;
                res.data = provisional;
                return res;
            }
            catch (Exception e)
            {
                res.code = "0";
                res.count = 0;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return res;
            }
        }
        //        res.code = "1";
        //        res.count = 1;
        //        res.Message = error;
        //        res.data = provisional;
        //        return res;
        //    }
        //    catch (Exception e)
        //    {
        //        res.code = "0";
        //        res.count = 0;
        //        res.Message = "Exception！" + e.ToString();
        //        res.data = null;
        //        return res;
        //    }
        //}

        /// <summary>
        /// 判断当前职员是否存在
        /// </summary>
        /// <param name="HEmpNumber"></param>
        /// <param name="HEmpName"></param>
        /// <returns></returns>
        private bool JudgeEmp(string HEmpNumber, string HEmpName)
        {
            if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
            {
                DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
                return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
            }
            return false;
        }
        ///// <summary>
        ///// 判断当前职员是否存在
        ///// </summary>
        ///// <param name="HEmpNumber"></param>
        ///// <param name="HEmpName"></param>
        ///// <returns></returns>
        //private bool JudgeEmp(string HEmpNumber, string HEmpName)
        //{
        //    if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
        //    {
        //        DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
        //        return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
        //    }
        //    return false;
        //}

        /// <summary>
        /// 判断列