From cee055eb7cdecf5d995cc65d379494e471bde9c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 02 四月 2025 10:06:03 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 210 ++++++++++++++++++++++------------------------------
1 files changed, 90 insertions(+), 120 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index da05301..04e789b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -177,37 +177,7 @@
}
}
- #endregion
-
-
- #region 璁惧鍒嗗竷 鐢熶骇璧勬簮瀵瑰簲鐨勮鍗�
-
- [Route("Sc_OrderStateDistribution/Sc_OrderStateDistribution_Souce")]
- [HttpGet]
- public object Sc_OrderStateDistribution_Souce(string sWhere,string user,int OrganizationID)
- {
- try
- {
- string sql1 = string.Format("exec h_p_sc_HDeptSouceMOList {0},{1}", sWhere, OrganizationID);
-
- ds = oCN.RunProcReturn(sql1, "h_p_sc_HDeptSouceMOList");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds;
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
+ #endregion
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
@@ -1166,95 +1136,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 +1232,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>
/// 鍒ゆ柇鍒�
--
Gitblit v1.9.1