From 3e783ac35c550b1d823f11dacb029885a6c760fe Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 17 八月 2022 17:40:27 +0800
Subject: [PATCH] 设备点检标准(查询、新增、编辑、删除、查看)接口开发
---
VueWebApi/Controllers/DeviceManagerController.cs | 85 ++++++++++
VueWebApi/Controllers/QualityManagementController.cs | 2
VueWebApi/DLL/BLL/DeviceManagerBLL.cs | 37 ++++
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 10
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 293 ++++++++++++++++++++++++++++++++++++
6 files changed, 418 insertions(+), 9 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index f43ddb4..dfdab2e 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 8448adc..aaea4d4 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -397,5 +397,90 @@
}
#endregion
+
+ #region[璁惧鐐规鏍囧噯鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍒楄〃鏌ヨ
+ /// </summary>
+ /// <param name="checkstandcode">鐐规鏍囧噯缂栫爜</param>
+ /// <param name="checkstandname">鐐规鏍囧噯鍚嶇О</param>
+ /// <param name="checkcontr">鐐规绠℃帶</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckStandArdSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckStandArdSearch(string checkstandcode = null, string checkstandname = null, string checkcontr = 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.DeviceCheckStandArdSearch(checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckItemSelect")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckItemSelect()
+ {
+ mes = DeviceManagerBLL.DeviceCheckItemSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewDeviceCheckStanedSearch")]
+ [HttpPost]
+ public HttpResponseMessage ViewDeviceCheckStanedSearch(string checkstand_code)
+ {
+ mes = DeviceManagerBLL.ViewDeviceCheckStanedSearch(checkstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板缂栬緫]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鏂板缂栬緫
+ /// </summary>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceCheckStandArd")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = DeviceManagerBLL.AddUpdateDeviceCheckStandArd(opertype, json, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鍒犻櫎]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍒犻櫎
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceCheckStaned")]
+ [HttpPost]
+ public HttpResponseMessage DeleteDeviceCheckStaned(string checkstand_code)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceCheckStaned(checkstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
}
}
diff --git a/VueWebApi/Controllers/QualityManagementController.cs b/VueWebApi/Controllers/QualityManagementController.cs
index 96141d0..c13c260 100644
--- a/VueWebApi/Controllers/QualityManagementController.cs
+++ b/VueWebApi/Controllers/QualityManagementController.cs
@@ -137,7 +137,7 @@
/// <summary>
/// 宸ュ簭妫�楠屾爣鍑嗗垹闄�
/// </summary>
- /// <param name="stanedcode">stanedcode</param>
+ /// <param name="stanedcode">宸ュ簭妫�楠屾爣鍑嗗垹闄�</param>
/// <returns></returns>
[Route(template: "DeleteStepCheckStaned")]
[HttpPost]
diff --git a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
index 4ee0d19..6b029d4 100644
--- a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -148,5 +148,42 @@
return DeviceManagerDAL.DeleteDeviceMaiItem(maiitemcode);
}
#endregion
+
+
+
+ #region[璁惧鐐规鏍囧噯鍒楄〃鏌ヨ]
+ public static ToMessage DeviceCheckStandArdSearch(string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
+ {
+ return DeviceManagerDAL.DeviceCheckStandArdSearch(checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
+ public static ToMessage DeviceCheckItemSelect()
+ {
+ return DeviceManagerDAL.DeviceCheckItemSelect();
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ public static ToMessage ViewDeviceCheckStanedSearch(string checkstand_code)
+ {
+ return DeviceManagerDAL.ViewDeviceCheckStanedSearch(checkstand_code);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板缂栬緫]
+ public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, string username)
+ {
+ return DeviceManagerDAL.AddUpdateDeviceCheckStandArd(opertype, json, username);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鍒犻櫎]
+ public static ToMessage DeleteDeviceCheckStaned(string checkstand_code)
+ {
+ return DeviceManagerDAL.DeleteDeviceCheckStaned(checkstand_code);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 7493624..426cbd0 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -648,7 +648,7 @@
#region[璁惧鐐规椤瑰垪琛ㄦ煡璇
- public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode,string cycle, int startNum, int endNum, string prop, string order)
+ 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 = "";
@@ -800,7 +800,7 @@
mes.data = null;
return mes;
}
-
+
//鍒犻櫎鐐规椤圭洰
sql = @"delete TEqpchk_Item where code=@checkitemcode";
list.Add(new { str = sql, parm = new { checkitemcode = checkitemcode } });
@@ -1018,5 +1018,294 @@
return mes;
}
#endregion
+
+
+
+ #region[璁惧鐐规鏍囧噯鍒楄〃鏌ヨ]
+ public static ToMessage DeviceCheckStandArdSearch(string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (checkstandcode != "" && checkstandcode != null)
+ {
+ search += "and code like '%'+@checkstandcode+'%' ";
+ dynamicParams.Add("@checkstandcode", checkstandcode);
+ }
+ if (checkstandname != "" && checkstandname != null)
+ {
+ search += "and name like '%'+@checkstandname+'%' ";
+ dynamicParams.Add("@checkstandname", checkstandname);
+ }
+ if (checkcontr != "" && checkcontr != null)
+ {
+ search += "and iscontr=@checkcontr ";
+ dynamicParams.Add("@checkcontr", checkcontr);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select id,code,name,description,iscontr,is_checkeqp,lm_user,lm_date
+ from TEqpchk_Main 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 DeviceCheckItemSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇璁惧鐐规椤圭洰鏁版嵁
+ sql = @"select code,name,description from TEqpchk_Item where is_delete<>'1' ";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ public static ToMessage ViewDeviceCheckStanedSearch(string checkstand_code)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇璁惧鐐规鏍囧噯淇℃伅
+ sql = @"select code,name,description,iscontr
+ from TEqpchk_Main
+ where code=@checkstand_code and is_delete<>'1'";
+ dynamicParams.Add("@checkstand_code", checkstand_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ RoutEdit rout = new RoutEdit();
+ if (data.Rows.Count > 0)
+ {
+ rout.code = data.Rows[0]["CODE"].ToString();
+ rout.name = data.Rows[0]["NAME"].ToString();
+ rout.description = data.Rows[0]["DESCRIPTION"].ToString();
+ rout.enable = data.Rows[0]["ISCONTR"].ToString();
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+ //鏍规嵁璁惧鐐规鏍囧噯缂栫爜鑾峰彇鍏宠仈鐨勬楠岄」鐩俊鎭�
+ sql = @"select B.code,B.name,A.chkdesc,A.isscan,A.cycle from TEqpchk_Deta A
+ left join TEqpchk_Item B on A.code=B.code
+ where A.eqpcheck_main_code=@checkstaned_code order by A.seq asc";
+ dynamicParams.Add("@checkstaned_code", rout.code);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ rout.Data = data0;
+
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = rout;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板缂栬緫]
+ public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, string username)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ try
+ {
+ if (opertype == "Add")
+ {
+ //鏂板璁惧鐐规鏍囧噯涓昏〃
+ sql = @"insert into TEqpchk_Main(code,name,description,iscontr,lm_user,lm_date) values(@code,@name,@descr,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description, iscontr = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
+ for (int i = 0; i < json.Data.Rows.Count; i++)
+ {
+ //鏂板璁惧鐐规鏍囧噯鍏宠仈鐐规椤瑰瓙琛�
+ sql = @"insert TEqpchk_Deta (seq,code,name,eqpchk_main_code,cycle,chkdesc,isscan,lm_user,lm_date)
+ values(@checkitem_seq,@checkitem_code,@checkitem_name,@code,@cycle,@chkdesc,@isscan,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
+ code = json.code,
+ cycle = json.Data.Rows[i]["CYCLE"].ToString(),
+ chkdesc= json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ isscan= json.Data.Rows[i]["ISSCAN"].ToString(),
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ 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;
+ }
+ }
+ if (opertype == "Update")
+ {
+ //鍒犻櫎鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
+ sql = @"delete from TEqpchk_Deta where eqpchk_main_code=@checkstaned_code";
+ list.Add(new { str = sql, parm = new { checkstaned_code = json.code } });
+ //淇敼鐐规鏍囧噯涓昏〃
+ sql = @"update TEqpchk_Main set name=@checkstaned_name,description=@checkstaned_desc,iscontr=@iscontr where code=@checkstaned_code";
+ list.Add(new { str = sql, parm = new { checkstaned_code = json.code, checkstaned_name = json.name, checkstaned_desc = json.description } });
+ //鏂板鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
+ for (int i = 0; i < json.Data.Rows.Count; i++)
+ {
+ sql = @"insert TEqpchk_Deta (seq,code,name,eqpchk_main_code,cycle,chkdesc,isscan,lm_user,lm_date)
+ values(@checkitem_seq,@checkitem_code,@checkitem_name,@code,@cycle,@chkdesc,@isscan,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
+ code = json.code,
+ cycle = json.Data.Rows[i]["CYCLE"].ToString(),
+ chkdesc = json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ isscan = json.Data.Rows[i]["ISSCAN"].ToString(),
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+
+ 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 DeleteDeviceCheckStaned(string checkstand_code)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TEqpchk_Proc_Main where eqpchkmain_code=@checkstand_code";
+ dynamicParams.Add("@checkstand_code", checkstand_code);
+ 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_Main where code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ //鍒犻櫎璁惧鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
+ sql = @"delete TEqpchk_Deta where eqpchk_main_code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+
+ 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/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index 8e6d5f0..fb94930 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -400,14 +400,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.Message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.Message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -433,14 +433,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.Message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.Message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -636,8 +636,6 @@
return mes;
}
#endregion
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3