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_CustomerController.cs | 157 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 112 insertions(+), 45 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 03f153d..18b2239 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/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 杩斿洖瀹㈡埛鍒楄〃
@@ -101,6 +101,73 @@
}
}
#endregion
+
+ #region 瀹㈡埛鍒嗛〉鍒楄〃
+ [Route("Gy_Customer/page")]
+ [HttpGet]
+ public json Gy_CustomerPage(string sWhere, string user, int page, int size, string Organization)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Crm_CustomerFileList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹㈡埛鍒跺畾
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName != "涔斾竴")
+ {
+ sWhere += ("and 缁勭粐鍚嶇О = '" + Organization + "'");
+ }
+ }
+
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_CustomerList " + page + "," + size + ",''", "h_p_Gy_CustomerList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_CustomerList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_CustomerList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 瀹㈡埛瀛愯〃[鍏宠仈鐢ㄦ埛] 鏌ヨ
/// <summary>
@@ -1367,41 +1434,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 +1476,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