From 43d31c2e56da8954828be4a7e027c6ad0aaf038a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 17 八月 2022 10:45:10 +0800
Subject: [PATCH] 设备点检项目、保养项目接口(查询、新增、编辑、删除、导入)
---
VueWebApi/Tools/ExcelList.cs | 6
VueWebApi/Tools/ImportExcelData.cs | 377 +++++++++++++++------
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/Excel/设备点检项目.xls | 0
VueWebApi/VueWebApi.csproj | 2
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/DLL/DAL/ExcelCheckDAL.cs | 30 +
VueWebApi/Controllers/DeviceManagerController.cs | 130 +++++++
VueWebApi/DLL/BLL/DeviceManagerBLL.cs | 46 ++
VueWebApi/Excel/设备保养项目.xls | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 374 ++++++++++++++++++++++
12 files changed, 846 insertions(+), 119 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index cc84f46..f43ddb4 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index 4e4ac94..8448adc 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -267,5 +267,135 @@
}
#endregion
+
+
+ #region[璁惧鐐规椤瑰垪琛ㄦ煡璇
+ /// <summary>
+ /// 璁惧鐐规椤瑰垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="checkitemcode">鐐规閮ㄤ綅缂栫爜</param>
+ /// <param name="checkitemname">鐐规閮ㄤ綅鍚嶇О</param>
+ /// <param name="checkdescr">鐐规瑕佹眰</param>
+ /// <param name="isqrcode">閫変腑鎵爜</param>
+ /// <param name="cycle">鐐规鍛ㄦ湡</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckItemSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckItemSearch(string checkitemcode = null, string checkitemname = null, string checkdescr = null, string isqrcode = null,string cycle=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 璁惧鐐规椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceCheckItem")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateDeviceCheckItem([FromBody] JObject obj)
+ {
+ string checkitemid = obj["id"].ToString(); //璁惧鐐规椤筰d(涓婚敭)
+ string checkitemcode = obj["checkitemcode"].ToString(); //璁惧鐐规閮ㄤ綅缂栫爜
+ string checkitemname = obj["checkitemname"].ToString(); //璁惧鐐规閮ㄤ綅鍚嶇О
+ string checkitemdescr = obj["checkitemdescr"].ToString(); //璁惧鐐规閮ㄤ綅瑕佹眰
+ string cycle = obj["cycle"].ToString(); //璁惧鐐规閮ㄤ綅鍛ㄦ湡
+ string isqrcode = obj["isqrcode"].ToString(); //鏄惁鎵爜
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = DeviceManagerBLL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, usercode, OperType);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤瑰垹闄
+ /// <summary>
+ /// 璁惧鐐规椤瑰垹闄�
+ /// </summary>
+ /// <param name="checkitemcode">璁惧鐐规椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceCheckItem")]
+ [HttpPost]
+ public HttpResponseMessage DeleteDeviceCheckItem(string checkitemcode)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceCheckItem(checkitemcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[璁惧淇濆吇椤瑰垪琛ㄦ煡璇
+ /// <summary>
+ /// 璁惧淇濆吇椤瑰垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="maiitemcode">淇濆吇閮ㄤ綅缂栫爜</param>
+ /// <param name="maiitemname">淇濆吇閮ㄤ綅鍚嶇О</param>
+ /// <param name="maidescr">淇濆吇瑕佹眰</param>
+ /// <param name="isqrcode">閫変腑鎵爜</param>
+ /// <param name="cycle">淇濆吇鍛ㄦ湡</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceMaiItemSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceMaiItemSearch(string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null, string cycle = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, cycle, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 璁惧淇濆吇椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceMaiItem")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateDeviceMaiItem([FromBody] JObject obj)
+ {
+ string maiitemid = obj["id"].ToString(); //璁惧淇濆吇椤筰d(涓婚敭)
+ string maiitemcode = obj["maiitemcode"].ToString(); //璁惧淇濆吇閮ㄤ綅缂栫爜
+ string maiitemname = obj["maiitemname"].ToString(); //璁惧淇濆吇閮ㄤ綅鍚嶇О
+ string maiitemdescr = obj["maiitemdescr"].ToString(); //璁惧淇濆吇閮ㄤ綅瑕佹眰
+ string cycle = obj["cycle"].ToString(); //璁惧鐐规閮ㄤ綅鍛ㄦ湡
+ string isqrcode = obj["isqrcode"].ToString(); //鏄惁鎵爜
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, OperType);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤瑰垹闄
+ /// <summary>
+ /// 璁惧淇濆吇椤瑰垹闄�
+ /// </summary>
+ /// <param name="maiitemcode">璁惧淇濆吇椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceMaiItem")]
+ [HttpPost]
+ public HttpResponseMessage DeleteDeviceMaiItem(string maiitemcode)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceMaiItem(maiitemcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
}
}
diff --git a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
index 6bab176..4ee0d19 100644
--- a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -102,5 +102,51 @@
return DeviceManagerDAL.DeleteDeviceManger(devicecode);
}
#endregion
+
+
+
+
+ #region[璁惧鐐规椤瑰垪琛ㄦ煡璇
+ public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode,string cycle, int startNum, int endNum, string prop, string order)
+ {
+ return DeviceManagerDAL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤规柊澧炵紪杈慮
+ public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, string usercode, string operType)
+ {
+ return DeviceManagerDAL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, usercode, operType);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤瑰垹闄
+ public static ToMessage DeleteDeviceCheckItem(string checkitemcode)
+ {
+ return DeviceManagerDAL.DeleteDeviceCheckItem(checkitemcode);
+ }
+ #endregion
+
+
+ #region[璁惧淇濆吇椤瑰垪琛ㄦ煡璇
+ public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
+ {
+ return DeviceManagerDAL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, cycle, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤规柊澧炵紪杈慮
+ public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string cycle, string isqrcode, string usercode, string operType)
+ {
+ return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, operType);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤瑰垹闄
+ public static ToMessage DeleteDeviceMaiItem(string maiitemcode)
+ {
+ return DeviceManagerDAL.DeleteDeviceMaiItem(maiitemcode);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 34171f1..7493624 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -644,5 +644,379 @@
return mes;
}
#endregion
+
+
+
+ #region[璁惧鐐规椤瑰垪琛ㄦ煡璇
+ public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode,string cycle, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (checkitemcode != "" && checkitemcode != null)
+ {
+ search += "and code like '%'+@checkitemcode+'%' ";
+ dynamicParams.Add("@checkitemcode", checkitemcode);
+ }
+ if (checkitemname != "" && checkitemname != null)
+ {
+ search += "and name like '%'+@checkitemname+'%' ";
+ dynamicParams.Add("@checkitemname", checkitemname);
+ }
+ if (checkdescr != "" && checkdescr != null)
+ {
+ search += "and description=@checkdescr ";
+ dynamicParams.Add("@checkdescr", checkdescr);
+ }
+ if (isqrcode != "" && isqrcode != null)
+ {
+ search += "and isscan=@isqrcode ";
+ dynamicParams.Add("@isqrcode", isqrcode);
+ }
+ if (cycle != "" && cycle != null)
+ {
+ search += "and isscan=@cycle ";
+ dynamicParams.Add("@cycle", cycle);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select id,code,name,description,isscan,cycle,lm_user,lm_date
+ from TEqpchk_Item where is_delete<>'1' " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧鐐规椤规柊澧炵紪杈慮
+ public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, string usercode, string operType)
+ {
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (operType == "Add")
+ {
+ var sql = @"insert into TEqpchk_Item(code,name,description,isscan,cycle,lm_user,lm_date)
+ values(@checkitemcode,@checkitemname,@checkitemdescr,@isqrcode,@cycle,@usercode,@CreateDate)";
+ dynamicParams.Add("@checkitemcode", checkitemcode);
+ dynamicParams.Add("@checkitemname", checkitemname);
+ dynamicParams.Add("@checkitemdescr", checkitemdescr);
+ dynamicParams.Add("@isqrcode", isqrcode);
+ dynamicParams.Add("@cycle", cycle);
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ if (operType == "Update")
+ {
+ var sql = @"update TEqpchk_Item set name=@checkitemname,description=@checkitemdescr,isscan=@isqrcode,cycle=@cycle,
+ lm_user=@usercode,lm_date=@CreateDate
+ where id=@checkitemid";
+ dynamicParams.Add("@checkitemid", checkitemid);
+ dynamicParams.Add("@checkitemname", checkitemname);
+ dynamicParams.Add("@checkitemdescr", checkitemdescr);
+ dynamicParams.Add("@isqrcode", isqrcode);
+ dynamicParams.Add("@cycle", cycle);
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧鐐规椤瑰垹闄
+ public static ToMessage DeleteDeviceCheckItem(string checkitemcode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇鐐规鏍囧噯椤圭洰鏄惁鏈夊叧鑱旂偣妫�鏍囧噯,涓嶅厑璁稿垹闄�
+ sql = @"select * from TEqpchk_Deta
+ where code=@checkitemcode";
+ dynamicParams.Add("@checkitemcode", checkitemcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+
+ //鍒犻櫎鐐规椤圭洰
+ sql = @"delete TEqpchk_Item where code=@checkitemcode";
+ list.Add(new { str = sql, parm = new { checkitemcode = checkitemcode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+ #region[璁惧淇濆吇椤瑰垪琛ㄦ煡璇
+ public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (maiitemcode != "" && maiitemcode != null)
+ {
+ search += "and code like '%'+@maiitemcode+'%' ";
+ dynamicParams.Add("@maiitemcode", maiitemcode);
+ }
+ if (maiitemname != "" && maiitemname != null)
+ {
+ search += "and name like '%'+@maiitemname+'%' ";
+ dynamicParams.Add("@maiitemname", maiitemname);
+ }
+ if (maidescr != "" && maidescr != null)
+ {
+ search += "and description=@maidescr ";
+ dynamicParams.Add("@maidescr", maidescr);
+ }
+ if (isqrcode != "" && isqrcode != null)
+ {
+ search += "and isscan=@isqrcode ";
+ dynamicParams.Add("@isqrcode", isqrcode);
+ }
+ if (cycle != "" && cycle != null)
+ {
+ search += "and isscan=@cycle ";
+ dynamicParams.Add("@cycle", cycle);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select id,code,name,description,isscan,cycle,lm_user,lm_date
+ from TEqpmai_Item where is_delete<>'1' " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤规柊澧炵紪杈慮
+ public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string cycle, string isqrcode, string usercode, string operType)
+ {
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (operType == "Add")
+ {
+ var sql = @"insert into TEqpmai_Item(code,name,description,isscan,cycle,lm_user,lm_date)
+ values(@maiitemcode,@maiitemname,@checkitemdescr,@isqrcode,@cycle,@usercode,@CreateDate)";
+ dynamicParams.Add("@maiitemcode", maiitemcode);
+ dynamicParams.Add("@maiitemname", maiitemname);
+ dynamicParams.Add("@maiitemdescr", maiitemdescr);
+ dynamicParams.Add("@isqrcode", isqrcode);
+ dynamicParams.Add("@cycle", cycle);
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ if (operType == "Update")
+ {
+ var sql = @"update TEqpmai_Item set name=@maiitemname,description=@maiitemdescr,isscan=@isqrcode,cycle=@cycle,
+ lm_user=@usercode,lm_date=@CreateDate
+ where id=@maiitemid";
+ dynamicParams.Add("@maiitemid", maiitemid);
+ dynamicParams.Add("@maiitemname", maiitemname);
+ dynamicParams.Add("@maiitemdescr", maiitemdescr);
+ dynamicParams.Add("@isqrcode", isqrcode);
+ dynamicParams.Add("@cycle", cycle);
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤瑰垹闄
+ public static ToMessage DeleteDeviceMaiItem(string maiitemcode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇淇濆吇鏍囧噯椤圭洰鏄惁鏈夊叧鑱斾繚鍏绘爣鍑�,涓嶅厑璁稿垹闄�
+ sql = @"select * from TEqpmai_Deta
+ where code=@maiitemcode";
+ dynamicParams.Add("@maiitemcode", maiitemcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+
+ //鍒犻櫎淇濆吇椤圭洰
+ sql = @"delete TEqpmai_Item where code=@maiitemcode";
+ list.Add(new { str = sql, parm = new { maiitemcode = maiitemcode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebApi/DLL/DAL/ExcelCheckDAL.cs
index 5f90ffb..2bca88f 100644
--- a/VueWebApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebApi/DLL/DAL/ExcelCheckDAL.cs
@@ -43,10 +43,16 @@
case "9"://璁惧娓呭崟
Message = ImportExcelData.Nine(savePath, out StuCode);
break;
- case "10"://璁惧鐐规
+ case "10"://璁惧鐐规椤圭洰
Message = ImportExcelData.Ten(savePath, out StuCode);
break;
- case "11"://璁惧淇濆吇
+ case "22"://璁惧鐐规鏍囧噯
+ Message = ImportExcelData.Ten(savePath, out StuCode);
+ break;
+ case "11"://璁惧淇濆吇椤圭洰
+ Message = ImportExcelData.Eleven(savePath, out StuCode);
+ break;
+ case "23"://璁惧淇濆吇鏍囧噯
Message = ImportExcelData.Eleven(savePath, out StuCode);
break;
case "12"://宸ヨ娓呭崟
@@ -126,10 +132,16 @@
case "9"://璁惧娓呭崟
list = ImportExcelData.NineData(savePath, out stuCode, out message, out count);
break;
- case "10"://璁惧鐐规
+ case "10"://璁惧鐐规椤圭洰
list = ImportExcelData.TenData(savePath, out stuCode, out message, out count);
break;
- case "11"://璁惧淇濆吇
+ case "22"://璁惧鐐规鏍囧噯
+ list = ImportExcelData.TenData(savePath, out stuCode, out message, out count);
+ break;
+ case "11"://璁惧淇濆吇椤圭洰
+ list = ImportExcelData.ElevenData(savePath, out stuCode, out message, out count);
+ break;
+ case "23"://璁惧淇濆吇鏍囧噯
list = ImportExcelData.ElevenData(savePath, out stuCode, out message, out count);
break;
case "12"://宸ヨ娓呭崟
@@ -200,10 +212,16 @@
case "9"://璁惧娓呭崟
Message = ImportExcelData.NineSubmit(savePath, User, out StuCode);
break;
- case "10"://璁惧鐐规
+ case "10"://璁惧鐐规椤圭洰
Message = ImportExcelData.TenSubmit(savePath, User, out StuCode);
break;
- case "11"://璁惧淇濆吇
+ case "22"://璁惧鐐规鏍囧噯
+ Message = ImportExcelData.TenSubmit(savePath, User, out StuCode);
+ break;
+ case "11"://璁惧淇濆吇椤圭洰
+ Message = ImportExcelData.ElevenSubmit(savePath, User, out StuCode);
+ break;
+ case "23"://璁惧淇濆吇鏍囧噯
Message = ImportExcelData.ElevenSubmit(savePath, User, out StuCode);
break;
case "12"://宸ヨ娓呭崟
diff --git "a/VueWebApi/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls" "b/VueWebApi/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
new file mode 100644
index 0000000..b594159
--- /dev/null
+++ "b/VueWebApi/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
Binary files differ
diff --git "a/VueWebApi/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\351\241\271\347\233\256.xls" "b/VueWebApi/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\351\241\271\347\233\256.xls"
new file mode 100644
index 0000000..dce631a
--- /dev/null
+++ "b/VueWebApi/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\351\241\271\347\233\256.xls"
Binary files differ
diff --git a/VueWebApi/Tools/ExcelList.cs b/VueWebApi/Tools/ExcelList.cs
index 412d9bb..1ef7929 100644
--- a/VueWebApi/Tools/ExcelList.cs
+++ b/VueWebApi/Tools/ExcelList.cs
@@ -20,8 +20,10 @@
new ScoreReport("7","瀹瑰櫒瀹氫箟"),
new ScoreReport("8","瀛樿揣妗ｆ"),
new ScoreReport("9","璁惧娓呭崟"),
- new ScoreReport("10","璁惧鐐规"),
- new ScoreReport("11","璁惧淇濆吇"),
+ new ScoreReport("10","璁惧鐐规椤圭洰"),
+ new ScoreReport("22","璁惧鐐规鏍囧噯"),
+ new ScoreReport("11","璁惧淇濆吇椤圭洰"),
+ new ScoreReport("23","璁惧淇濆吇鏍囧噯"),
new ScoreReport("12","宸ヨ娓呭崟"),
new ScoreReport("13","宸ヨ鐐规"),
new ScoreReport("14","宸ヨ淇濆吇"),
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 0878889..0057bdd 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -634,7 +634,7 @@
}
#endregion
- #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规妯℃澘銆�
+ #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧鐐规椤圭洰妯℃澘銆�
public static string Ten(string FileCode, out string code)
{
string Message = "";
@@ -644,82 +644,51 @@
if (excelTable.Count != 2)
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+ Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+ return Message;
+
}
- else if (excelTable[0].Columns.Count != 4)
+ else if (excelTable[0].Columns.Count != 6)
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- }
- else if (excelTable[1].Columns.Count != 9)
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
}
else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+ return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "鐐规鏍囧噯(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "鐐规椤圭洰缂栧彿(鍞竴)")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕鐐规椤圭洰缂栧彿(鍞竴)}";
+ return Message;
}
- else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
+ else if (excelTable[0].Columns[2].ColumnName != "鐐规椤圭洰鍚嶇О")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕鐐规椤圭洰鍚嶇О}";
+ return Message;
}
- else if (excelTable[0].Columns[3].ColumnName != "鐐规绠℃帶")
+ else if (excelTable[0].Columns[3].ColumnName != "鐐规鍛ㄦ湡")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规鍛ㄦ湡}";
+ return Message;
}
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
+ return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "鐐规鏍囧噯")
+ else if (excelTable[0].Columns[5].ColumnName != "鐐规椤圭洰瑕佹眰")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉＄爜锛堝敮涓�锛�")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[6].ColumnName != "鐐规瑕佹眰")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[7].ColumnName != "鏄惁鎵爜")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[8].ColumnName != "鐐规鍛ㄦ湡")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规椤圭洰瑕佹眰}";
+ return Message;
}
else
{
@@ -730,7 +699,7 @@
}
#endregion
- #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧淇濆吇妯℃澘銆�
+ #region銆怑xcel妯℃澘涓婁紶楠岃瘉,璁惧淇濆吇椤圭洰妯℃澘銆�
public static string Eleven(string FileCode, out string code)
{
string Message = "";
@@ -740,77 +709,51 @@
if (excelTable.Count != 2)
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+ Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+ return Message;
+
}
- else if (excelTable[0].Columns.Count != 3)
+ else if (excelTable[0].Columns.Count != 6)
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- }
- else if (excelTable[1].Columns.Count != 9)
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
}
else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+ return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "淇濆吇鏍囧噯(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "淇濆吇椤圭洰缂栧彿(鍞竴)")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕淇濆吇椤圭洰缂栧彿(鍞竴)}";
+ return Message;
}
- else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
+ else if (excelTable[0].Columns[2].ColumnName != "淇濆吇椤圭洰鍚嶇О")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕淇濆吇椤圭洰鍚嶇О}";
+ return Message;
}
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns[3].ColumnName != "淇濆吇鍛ㄦ湡")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇鍛ㄦ湡}";
+ return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "淇濆吇鏍囧噯")
+ else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
+ return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
+ else if (excelTable[0].Columns[5].ColumnName != "淇濆吇椤圭洰瑕佹眰")
{
code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉＄爜锛堝敮涓�锛�")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[6].ColumnName != "淇濆吇瑕佹眰")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[7].ColumnName != "鏄惁鎵爜")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[8].ColumnName != "淇濆吇鍛ㄦ湡")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇椤圭洰瑕佹眰}";
+ return Message;
}
else
{
@@ -1976,7 +1919,7 @@
}
#endregion
- #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧鐐规銆�
+ #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧鐐规椤圭洰銆�
public static List<ExcelErro> TenData(string FileCode, out string StuCode, out string message, out int count)
{
@@ -1985,13 +1928,51 @@
count = 0;
string sql = "";
DataTable dt;
+ var dynamicParams = new DynamicParameters();
List<ExcelErro> list = new List<ExcelErro>();
+ DataTable excelTable = new DataTable();
+ list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
+ for (int i = 0; i < excelTable.Rows.Count; i++)
+ {
+ if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+ {
+ sql = @"select code from TEqpchk_Item where code=@code";
+ dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{鐐规椤圭洰缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规椤圭洰琛�:{鐐规椤圭洰缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[i][1].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ if (list.Count > 0)
+ {
+ int index = 0;
+ foreach (ExcelErro item in list)
+ {
+ index++;
+ item.Seq = index.ToString();
+ }
+ StuCode = "301";
+ message = "鏁版嵁楠岃瘉澶辫触";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "鏁版嵁楠岃瘉鎴愬姛";
+ count = excelTable.Rows.Count;
+ }
return list;
}
#endregion
- #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧淇濆吇銆�
+ #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,璁惧淇濆吇椤圭洰銆�
public static List<ExcelErro> ElevenData(string FileCode, out string StuCode, out string message, out int count)
{
message = "";
@@ -1999,8 +1980,46 @@
count = 0;
string sql = "";
DataTable dt;
+ var dynamicParams = new DynamicParameters();
List<ExcelErro> list = new List<ExcelErro>();
+ DataTable excelTable = new DataTable();
+ list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
+ for (int i = 0; i < excelTable.Rows.Count; i++)
+ {
+ if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+ {
+ sql = @"select code from TEqpmai_Item where code=@code";
+ dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{淇濆吇椤圭洰缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧淇濆吇椤圭洰琛�:{鐐规淇濆吇缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[i][1].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ if (list.Count > 0)
+ {
+ int index = 0;
+ foreach (ExcelErro item in list)
+ {
+ index++;
+ item.Seq = index.ToString();
+ }
+ StuCode = "301";
+ message = "鏁版嵁楠岃瘉澶辫触";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "鏁版嵁楠岃瘉鎴愬姛";
+ count = excelTable.Rows.Count;
+ }
return list;
}
#endregion
@@ -2605,14 +2624,82 @@
}
#endregion
- #region銆怑xcel鏁版嵁涓婁紶,璁惧鐐规銆�
+ #region銆怑xcel鏁版嵁涓婁紶,璁惧鐐规椤圭洰銆�
public static string TenSubmit(string FileCode, string User, out string StuCode)
{
string message = "";
StuCode = "";
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
-
+ list.Clear();
+ DataTable excelTable = new DataTable();
+ excelTable = ImportExcel.ExcelToTable(FileCode);
+ //瀵煎叆璁惧鐐规椤圭洰琛�
+ for (int i = 0; i < excelTable.Rows.Count; i++)
+ {
+ string Type = "",IsScan="";
+ switch (excelTable.Rows[i][3].ToString().Trim())
+ {
+ case "骞�":
+ Type = "Y";
+ break;
+ case "瀛�":
+ Type = "S";
+ break;
+ case "鏈�":
+ Type = "M";
+ break;
+ case "鍛�":
+ Type = "W";
+ break;
+ case "鏃�":
+ Type = "D";
+ break;
+ default:
+ break;
+ }
+ switch (excelTable.Rows[i][4].ToString().Trim())
+ {
+ case "鏄�":
+ IsScan = "Y";
+ break;
+ case "鍚�":
+ IsScan = "N";
+ break;
+ default:
+ break;
+ }
+ sql = @"insert into TEqpchk_Item(code,name,description,isscan,cycle,lm_user,lm_date)
+ values(@code,@name,@descr,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = excelTable.Rows[i][1].ToString().Trim(),
+ name = excelTable.Rows[i][2].ToString().Trim(),
+ descr = excelTable.Rows[i][5].ToString().Trim(),
+ isscan = IsScan,
+ cycle = Type,
+ Operator = User,
+ CreateDate = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ StuCode = "200";
+ message = "瀵煎叆鎴愬姛锛�";
+ }
+ else
+ {
+ StuCode = "300";
+ message = "瀵煎叆澶辫触锛�";
+ }
}
catch (Exception e)
{
@@ -2623,14 +2710,82 @@
}
#endregion
- #region銆怑xcel鏁版嵁涓婁紶,璁惧淇濆吇銆�
+ #region銆怑xcel鏁版嵁涓婁紶,璁惧淇濆吇椤圭洰銆�
public static string ElevenSubmit(string FileCode, string User, out string StuCode)
{
string message = "";
StuCode = "";
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
-
+ list.Clear();
+ DataTable excelTable = new DataTable();
+ excelTable = ImportExcel.ExcelToTable(FileCode);
+ //瀵煎叆璁惧鐐规椤圭洰琛�
+ for (int i = 0; i < excelTable.Rows.Count; i++)
+ {
+ string Type = "", IsScan = "";
+ switch (excelTable.Rows[i][3].ToString().Trim())
+ {
+ case "骞�":
+ Type = "Y";
+ break;
+ case "瀛�":
+ Type = "S";
+ break;
+ case "鏈�":
+ Type = "M";
+ break;
+ case "鍛�":
+ Type = "W";
+ break;
+ case "鏃�":
+ Type = "D";
+ break;
+ default:
+ break;
+ }
+ switch (excelTable.Rows[i][4].ToString().Trim())
+ {
+ case "鏄�":
+ IsScan = "Y";
+ break;
+ case "鍚�":
+ IsScan = "N";
+ break;
+ default:
+ break;
+ }
+ sql = @"insert into TEqpmai_Item(code,name,description,isscan,cycle,lm_user,lm_date)
+ values(@code,@name,@descr,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = excelTable.Rows[i][1].ToString().Trim(),
+ name = excelTable.Rows[i][2].ToString().Trim(),
+ descr = excelTable.Rows[i][5].ToString().Trim(),
+ isscan = IsScan,
+ cycle = Type,
+ Operator = User,
+ CreateDate = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ StuCode = "200";
+ message = "瀵煎叆鎴愬姛锛�";
+ }
+ else
+ {
+ StuCode = "300";
+ message = "瀵煎叆澶辫触锛�";
+ }
}
catch (Exception e)
{
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index df65a77..6ac0463 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -435,6 +435,8 @@
<Content Include="Excel\寰�鏉ュ崟浣�.xls" />
<Content Include="grf\Rework.frx" />
<Content Include="Excel\缂洪櫡瀹氫箟.xls" />
+ <Content Include="Excel\璁惧鐐规椤圭洰.xls" />
+ <Content Include="Excel\璁惧淇濆吇椤圭洰.xls" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" />
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index f989e8c..230afa5 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index ab20e4e..33b736c 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
--
Gitblit v1.9.3