From f330d41697dc8b2fbbd879ce8a9b644dab7cc31c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 十二月 2023 17:04:59 +0800
Subject: [PATCH] 1.设备基础资料,设备点检项目、设备点检标准导入接口
---
VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs | 1418 ++++++++++++++++++++++++++--------------------------------
1 files changed, 633 insertions(+), 785 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
index 6e80d4d..ee9293d 100644
--- a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
@@ -34,7 +34,7 @@
where A.is_delete<>'1' ";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -42,7 +42,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -81,14 +81,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;
}
}
@@ -96,7 +96,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -120,7 +120,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璁惧缁勫凡鏈夊叧鑱旇澶囩粍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠璁惧缁勫凡鏈夊叧鑱旇澶囩粍,涓嶅厑璁稿垹闄�!";
mes.data = null;
}
else
@@ -133,14 +133,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;
}
}
@@ -149,7 +149,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -171,14 +171,14 @@
dynamicParams.Add("@eqptypecode", eqptypecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -217,14 +217,14 @@
where parent.is_delete<>'1' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -244,14 +244,14 @@
var data = DapperHelper.selectProcedure("h_p_T_WorkShopSelectLine", dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -259,6 +259,442 @@
#endregion
+
+
+
+
+
+
+
+ #region[璁惧绫诲瀷鏌ヨ]
+ public static ToMessage DeviceTypeSearch()
+ {
+ try
+ {
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var sql = @"select id, code,name
+ from TEqpType";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = data.Rows.Count;
+ 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 AddUpdateDeviceType(string OperType, List<ObjectDataCont> json, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ if (OperType == "Add")
+ {
+ //鍒ゆ柇璁惧绫诲瀷鏄惁閲嶅
+ sql = @"select * from TEqpType where code=@devtypecode";
+ dynamicParams.Add("@devtypecode", json[0].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 = @"select * from TEqpType where name=@devtypename";
+ dynamicParams.Add("@devtypename", json[0].name);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data1.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
+ }
+ //寰幆鍐欏叆璁惧绫诲瀷琛�
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = json[i].code,
+ name = json[i].name,
+ username = us.usercode,
+ createdate = DateTime.Now.ToString(),
+ description = json[i].description
+ }
+ });
+ }
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+ 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 = @"select * from TEqpType where code<>@devtypecode and name=@devtypename";
+ dynamicParams.Add("@devtypecode", json[0].code);
+ dynamicParams.Add("@devtypename", json[0].name);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data1.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
+ }
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"update TEqpType set name=@devtypename,remark=@remark,lm_user=@lm_user,lm_date=@lm_date
+ where code=@devtypecode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ devtypecode = json[i].code,
+ devtypename = json[i].name,
+ remark = json[i].description,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+ 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 DeleteDeviceType(string devicetypecode, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇璁惧鏈夋棤鍏宠仈璁惧绫诲瀷
+ sql = @"select * from TEqpInfo where eqptype_code=@devicetypecode";
+ dynamicParams.Add("@devicetypecode", devicetypecode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "褰撳墠璁惧绫诲瀷宸叉湁鍏宠仈璁惧,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ }
+ else
+ {
+ sql = @"delete TEqpType where code=@devicetypecode";
+ list.Add(new { str = sql, parm = new { devicetypecode = devicetypecode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚澶囩被鍨�:" + devicetypecode, us.usertype);
+ 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 DeviceMangerSearch(string devicecode, string devicename, string status, string storgcode, string devicetype, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (devicecode != "" && devicecode != null)
+ {
+ search += "and A.code like '%'+@devicecode+'%' ";
+ dynamicParams.Add("@devicecode", devicecode);
+ }
+ if (devicename != "" && devicename != null)
+ {
+ search += "and A.name like '%'+@devicename+'%' ";
+ dynamicParams.Add("@devicename", devicename);
+ }
+ if (status != "" && status != null)
+ {
+ search += "and A.enable=@status ";
+ dynamicParams.Add("@status", status);
+ }
+ if (storgcode != "" && storgcode != null)
+ {
+ search += "and A.torg_code=@storgcode ";
+ dynamicParams.Add("@storgcode", storgcode);
+ }
+ if (devicetype != "" && devicetype != null)
+ {
+ search += "and A.eqptype_code=@devicetype ";
+ dynamicParams.Add("@devicetype", devicetype);
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id,A.code,A.name,A.eqptype_code,B.name as eqptype_name,A.enable,A.torg_code,T.torg_name,A.opc_uom,U.username as lm_user,A.lm_date
+ from TEqpInfo A
+ left join TEqpType B on A.eqptype_code=B.code
+ left join TOrganization T on A.torg_code=T.torg_code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=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 AddUpdateDeviceManger(string devicecode, string devicename, string devicetype, string storgcode, string status, string OperType, User us)
+ {
+ var dynamicParams = new DynamicParameters();
+ string sql = "";
+ try
+ {
+ if (OperType == "Add")
+ {
+ //鍒ゆ柇璁惧缂栫爜鏄惁閲嶅
+ sql = @"select * from TEqpInfo where code=@devicecode";
+ dynamicParams.Add("@devicecode", devicecode);
+ 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 = @"select * from TEqpInfo where name=@devicename";
+ dynamicParams.Add("@devicename", devicename);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data1.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
+ }
+
+ sql = @"insert into TEqpInfo(code,name,eqptype_code,torg_code,enable,opc_uom,lm_user,lm_date)
+ values(@devicecode,@devicename,@devicetype,@torg_code,@status,@uom,@usercode,@CreateDate)";
+ dynamicParams.Add("@devicecode", devicecode);
+ dynamicParams.Add("@devicename", devicename);
+ dynamicParams.Add("@devicetype", devicetype);
+ dynamicParams.Add("@torg_code", storgcode);
+ dynamicParams.Add("@status", status);
+ dynamicParams.Add("@uom", "鍙�");
+ dynamicParams.Add("@usercode", us.usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶�:" + devicecode, us.usertype);
+ 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 = @"select * from TEqpInfo where code<>@code and name=@name";
+ dynamicParams.Add("@code", devicecode);
+ dynamicParams.Add("@name", devicename);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data1.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
+ }
+ sql = @"update TEqpInfo set name=@devicename,eqptype_code=@devicetype,torg_code=@torg_code,enable=@status,lm_user=@usercode,lm_date=@CreateDate
+ where code=@devicecode";
+ dynamicParams.Add("@devicecode", devicecode);
+ dynamicParams.Add("@devicename", devicename);
+ dynamicParams.Add("@devicetype", devicetype);
+ dynamicParams.Add("@torg_code", storgcode);
+ dynamicParams.Add("@status", status);
+ dynamicParams.Add("@usercode", us.usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚澶�:" + devicecode, us.usertype);
+ 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 DeleteDeviceManger(string devicecode, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇璁惧鏄惁鏈夊紑鎶ュ伐,涓嶅厑璁稿垹闄�
+
+ //鍒犻櫎璁惧
+ sql = @"delete TEqpInfo where code=@devicecode";
+ list.Add(new { str = sql, parm = new { devicecode = devicecode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚澶�:" + devicecode, us.usertype);
+ 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[璁惧鐐规椤瑰垪琛ㄦ煡璇
@@ -306,7 +742,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -314,7 +750,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -322,7 +758,7 @@
#endregion
#region[璁惧鐐规椤规柊澧炵紪杈慮
- public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, string usercode, string operType)
+ public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, User us, string operType)
{
var dynamicParams = new DynamicParameters();
try
@@ -336,21 +772,21 @@
dynamicParams.Add("@checkitemdescr", checkitemdescr);
dynamicParams.Add("@isqrcode", isqrcode);
dynamicParams.Add("@cycle", cycle);
- dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@usercode", us.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.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -364,21 +800,21 @@
dynamicParams.Add("@checkitemdescr", checkitemdescr);
dynamicParams.Add("@isqrcode", isqrcode);
dynamicParams.Add("@cycle", cycle);
- dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@usercode", us.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.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -387,7 +823,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -412,7 +848,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -425,14 +861,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;
}
@@ -441,13 +877,12 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
}
#endregion
-
#region[璁惧淇濆吇椤瑰垪琛ㄦ煡璇
@@ -490,7 +925,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -498,7 +933,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -506,7 +941,7 @@
#endregion
#region[璁惧淇濆吇椤规柊澧炵紪杈慮
- public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, string usercode, string operType)
+ public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, User us, string operType)
{
var dynamicParams = new DynamicParameters();
try
@@ -519,21 +954,21 @@
dynamicParams.Add("@maiitemname", maiitemname);
dynamicParams.Add("@maiitemdescr", maiitemdescr);
dynamicParams.Add("@isqrcode", isqrcode);
- dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@usercode", us.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.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -546,21 +981,21 @@
dynamicParams.Add("@maiitemname", maiitemname);
dynamicParams.Add("@maiitemdescr", maiitemdescr);
dynamicParams.Add("@isqrcode", isqrcode);
- dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@usercode", us.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.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -569,7 +1004,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -594,7 +1029,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -607,14 +1042,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;
}
@@ -623,7 +1058,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -631,30 +1066,13 @@
#endregion
-
#region[璁惧鐐规鏍囧噯鍒楄〃鏌ヨ]
- public static ToMessage DeviceCheckStandArdSearch(string stu_torgcode, string stu_torgtypecode, string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceCheckStandArdSearch(User us, string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
- string search1 = "";
try
{
- switch (stu_torgtypecode)
- {
- case "":
- break;
- case "D":
- search1 += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- case "W":
- search1 += "and F.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- default:
- break;
- }
if (checkstandcode != "" && checkstandcode != null)
{
search += "and A.code like '%'+@checkstandcode+'%' ";
@@ -683,12 +1101,10 @@
left join TUser U on A.lm_user=U.usercode
left join (
select distinct eqpchkmain_code from TEqpchk_Eqp M
- left join TOrganization F on M.torg_code=F.org_code
- left join TOrganization as L on F.parent_id=L.id
- where 1=1 " + search1 + ") M on A.code=M.eqpchkmain_code where A.is_delete<>'1' " + search;
+ ) M on A.code=M.eqpchkmain_code where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -696,7 +1112,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -713,14 +1129,14 @@
sql = @"select code,name,description from TEqpchk_Item where is_delete<>'1' ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -752,7 +1168,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -765,14 +1181,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -780,7 +1196,7 @@
#endregion
#region[璁惧鐐规鏍囧噯鏂板缂栬緫]
- public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, string username)
+ public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, User us)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -791,7 +1207,7 @@
{
//鏂板璁惧鐐规鏍囧噯涓昏〃
sql = @"insert into TEqpchk_Main(code,name,description,iscontr,lm_user,lm_date) values(@code,@name,@descr,@iscontr,@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() } });
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description, iscontr = json.enable, lm_user = us.usercode, lm_date = DateTime.Now.ToString() } });
for (int i = 0; i < json.Data.Rows.Count; i++)
{
//鏂板璁惧鐐规鏍囧噯鍏宠仈鐐规椤瑰瓙琛�
@@ -809,7 +1225,7 @@
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_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
});
@@ -819,14 +1235,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;
}
}
@@ -855,7 +1271,7 @@
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_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
});
@@ -866,14 +1282,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;
}
}
@@ -882,7 +1298,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -904,7 +1320,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -922,14 +1338,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;
}
}
@@ -937,7 +1353,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -945,38 +1361,22 @@
#endregion
#region[璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage DeviceCheckStanedAssociationEqp(string stu_torgcode, string description, string checkstand_code)
+ public static ToMessage DeviceCheckStanedAssociationEqp(User us, string checkstand_code)
{
string sql = "";
- string search = "";
var dynamicParams = new DynamicParameters();
List<StandEqp> list = new List<StandEqp>();
try
{
- switch (description)
- {
- case "":
- break;
- case "D":
- search += "and T.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- case "W":
- search += "and T.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- default:
- break;
- }
//鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
- sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
- from TOrganization T
- left join TOrganization as child on T.parent_id=child.id
+ sql = @"select distinct E.torg_code as wksp_code,T.torg_name as wksp_name,'E' as type,(case when B.wksp_code is null then 'N' else 'Y' end) flag
+ from TEqpInfo E
+ left join TOrganization T on E.torg_code=T.torg_code
left join(
- select distinct A.eqp_code,B.wksp_code from TEqpchk_Eqp A
+ select distinct B.torg_code as wksp_code from TEqpchk_Eqp A
inner join TEqpInfo B on A.eqp_code=B.code
- where A.eqpchkmain_code=@checkstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on T.org_code=B.wksp_code where T.description='W' and T.is_delete<>'1' " + search;
+ where A.eqpchkmain_code=@checkstand_code
+ ) B on T.torg_code=B.wksp_code";
dynamicParams.Add("@checkstand_code", checkstand_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
@@ -987,28 +1387,20 @@
rout.type = data.Rows[i]["TYPE"].ToString();
rout.flag = data.Rows[i]["FLAG"].ToString();
rout.children = new List<StandEqpCn>();
- //鏍规嵁杞﹂棿缂栫爜鏌ユ壘璁惧(鍖呭惈宸插叧鑱旀爣璇�)
- //sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
- // from TEqpInfo A
- // left join(
- // select distinct A.eqp_code from TEqpchk_Eqp A
- // inner join TEqpInfo B on A.eqp_code=B.code
- // where A.eqpchkmain_code=@checkstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- // ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
sql = @"select * from(
select AA.code,AA.name,'E' as type,(case when BB.eqpchkmain_code is null then 'N' else 'Y' end) flag,(case when AA.eqpchkmain_code is null then 'N' else 'Y' end) flage1
from(
select A.code,A.name,'' as eqpchkmain_code
from TEqpInfo A
- where A.wksp_code=@wkspcode and A.is_delete<>'1'
+ where A.torg_code=@wkspcode
) as AA
left join (
select A.code,A.name,B.eqpchkmain_code
from TEqpInfo A
inner join TEqpchk_Eqp B on A.code=B.eqp_code
- where A.wksp_code=@wkspcode and B.eqpchkmain_code=@checkstand_code and A.is_delete<>'1'
+ where A.torg_code=@wkspcode and B.eqpchkmain_code=@checkstand_code
) as BB on AA.code=BB.code
- ) as CC "; //where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1
+ ) as CC ";
dynamicParams.Add("@checkstand_code", checkstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -1024,14 +1416,14 @@
list.Add(rout);
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1039,72 +1431,48 @@
#endregion
#region [璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
- public static ToMessage SaveDeviceCheckStanedAssociationEqp(string stu_torgcode, string stu_torgtypecode, string checkstand_code, string username, List<ObjectData> json)
+ public static ToMessage SaveDeviceCheckStanedAssociationEqp(User us, string checkstand_code, List<ObjectData> json)
{
var sql = "";
var dynamicParams = new DynamicParameters();
- string search = "";
List<object> list = new List<object>();
try
{
list.Clear();
- switch (stu_torgtypecode)
+ //娓呴櫎璁惧鐐规鏍囧噯鍏宠仈璁惧琛ㄦ暟鎹�
+ sql = @"delete TEqpchk_Eqp where eqpchkmain_code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ //寰幆鍐欏叆璁惧鐐规鏍囧噯鍏宠仈璁惧琛�
+ for (int i = 0; i < json.Count; i++)
{
- case "":
- //娓呴櫎璁惧鐐规鏍囧噯鍏宠仈璁惧琛ㄦ暟鎹�
- sql = @"delete TEqpchk_Eqp where eqpchkmain_code=@checkstand_code";
- list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
- break;
- case "D":
- //娓呴櫎璁惧鐐规鏍囧噯鍏宠仈璁惧琛ㄦ暟鎹�
- sql = @"delete from TEqpchk_Eqp where id in (select A.id from TEqpchk_Eqp A
- left join TOrganization T on A.torg_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where 1=1 and A.eqpchkmain_code=@checkstand_code and L.org_code=@stu_torgcode)";
- list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code, stu_torgcode = stu_torgcode } });
- break;
- case "W":
- //娓呴櫎璁惧鐐规鏍囧噯鍏宠仈璁惧琛ㄦ暟鎹�
- sql = @"delete from TEqpchk_Eqp where id in (select A.id from TEqpchk_Eqp A
- left join TOrganization T on A.torg_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where 1=1 and A.eqpchkmain_code=@checkstand_code and T.org_code=@stu_torgcode)";
- list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code, stu_torgcode = stu_torgcode } });
- break;
- }
- if (json != null && json.Count > 0)
- {
- //寰幆鍐欏叆璁惧鐐规鏍囧噯鍏宠仈璁惧琛�
- for (int i = 0; i < json.Count; i++)
+ sql = @"insert into TEqpchk_Eqp(eqpchkmain_code,eqp_code,lm_user,lm_date,torg_code) values(@checkstand_code,@eqp_code,@lm_user,@lm_date,@torg_code)";
+ list.Add(new
{
- sql = @"insert into TEqpchk_Eqp(eqpchkmain_code,eqp_code,lm_user,lm_date,torg_code) values(@checkstand_code,@eqp_code,@lm_user,@lm_date,@torg_code)";
- list.Add(new
+ str = sql,
+ parm = new
{
- str = sql,
- parm = new
- {
- eqp_code = json[i].code,
- checkstand_code = checkstand_code,
- lm_user = username,
- lm_date = DateTime.Now.ToString(),
- torg_code = json[i].flag
- }
- });
- }
+ eqp_code = json[i].code,
+ checkstand_code = checkstand_code,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString(),
+ torg_code = json[i].flag
+ }
+ });
}
+
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
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;
}
}
@@ -1112,7 +1480,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1120,30 +1488,13 @@
#endregion
-
#region[璁惧淇濆吇鏍囧噯鍒楄〃鏌ヨ]
- public static ToMessage DeviceRepairStandArdSearch(string stu_torgcode, string stu_torgtypecode, string repairstandcode, string repairstandname, string repairstanddescr, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceRepairStandArdSearch(User us, string repairstandcode, string repairstandname, string repairstanddescr, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
- string search1 = "";
try
{
- switch (stu_torgtypecode)
- {
- case "":
- break;
- case "D":
- search1 += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- case "W":
- search1 += "and F.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- default:
- break;
- }
if (repairstandcode != "" && repairstandcode != null)
{
search += "and A.code like '%'+@repairstandcode+'%' ";
@@ -1174,12 +1525,10 @@
left join TUser U on A.lm_user=U.usercode
left join (
select distinct eapmai_code from TEqpmai_Eqp M
- left join TOrganization F on M.torg_code=F.org_code
- left join TOrganization as L on F.parent_id=L.id
- where 1=1 " + search1 + ") M on A.code=M.eapmai_code where A.is_delete<>'1' " + search;
+ ) M on A.code=M.eapmai_code where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1187,7 +1536,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1204,14 +1553,14 @@
sql = @"select code,name,description from TEqpmai_Item where is_delete<>'1' ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1243,7 +1592,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犱繚鍏绘爣鍑嗕俊鎭�!";
+ mes.message = "鏃犱繚鍏绘爣鍑嗕俊鎭�!";
mes.data = null;
return mes;
}
@@ -1256,14 +1605,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1271,7 +1620,7 @@
#endregion
#region[璁惧淇濆吇鏍囧噯鏂板缂栬緫]
- public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, string username)
+ public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, User us)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -1282,7 +1631,7 @@
{
//鏂板璁惧淇濆吇鏍囧噯涓昏〃
sql = @"insert into TEqpmai_Main(code,name,description,main_cycle,lm_user,lm_date) values(@code,@name,@descr,@main_cycle,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description, main_cycle = json.repaircycle, lm_user = username, lm_date = DateTime.Now.ToString() } });
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description, main_cycle = json.repaircycle, lm_user = us.usercode, lm_date = DateTime.Now.ToString() } });
for (int i = 0; i < json.Data.Rows.Count; i++)
{
//鏂板璁惧淇濆吇鏍囧噯鍏宠仈淇濆吇椤瑰瓙琛�
@@ -1299,7 +1648,7 @@
code = json.code,
repairdesc = json.Data.Rows[i]["REPAIRITEM_DESCR"].ToString(),
isscan = json.Data.Rows[i]["ISSCAN"].ToString(),
- lm_user = username,
+ lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
});
@@ -1309,14 +1658,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;
}
}
@@ -1344,7 +1693,7 @@
code = json.code,
repairdesc = json.Data.Rows[i]["REPAIRITEM_DESCR"].ToString(),
isscan = json.Data.Rows[i]["ISSCAN"].ToString(),
- lm_user = username,
+ lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
});
@@ -1355,14 +1704,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;
}
}
@@ -1371,7 +1720,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1393,7 +1742,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愪繚鍏昏褰�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愪繚鍏昏褰�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1412,14 +1761,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;
}
}
@@ -1427,7 +1776,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1435,38 +1784,22 @@
#endregion
#region[璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage DeviceRepairStanedAssociationEqp(string stu_torgcode, string description, string repairstand_code)
+ public static ToMessage DeviceRepairStanedAssociationEqp(User us, string repairstand_code)
{
string sql = "";
- string search = "";
var dynamicParams = new DynamicParameters();
List<StandEqp> list = new List<StandEqp>();
try
{
- switch (description)
- {
- case "":
- break;
- case "D":
- search += "and T.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- case "W":
- search += "and T.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- default:
- break;
- }
//鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
- sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
- from TOrganization T
- left join TOrganization as child on T.parent_id=child.id
+ sql = @"select distinct E.torg_code as wksp_code,T.torg_name as wksp_name,'E' as type,(case when B.wksp_code is null then 'N' else 'Y' end) flag
+ from TEqpInfo E
+ left join TOrganization T on E.torg_code=T.torg_code
left join(
- select distinct A.eqp_code,B.wksp_code from TEqpmai_Eqp A
+ select distinct B.torg_code as wksp_code from TEqpmai_Eqp A
inner join TEqpInfo B on A.eqp_code=B.code
- where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on T.org_code=B.wksp_code where T.description='W' and T.is_delete<>'1' " + search;
+ where A.eapmai_code=@repairstand_code
+ ) B on T.torg_code=B.wksp_code ";
dynamicParams.Add("@repairstand_code", repairstand_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1479,27 +1812,20 @@
rout.flag = data.Rows[i]["FLAG"].ToString();
rout.children = new List<StandEqpCn>();
//鏍规嵁杞﹂棿缂栫爜鏌ユ壘璁惧(鍖呭惈宸插叧鑱旀爣璇�)
- //sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
- // from TEqpInfo A
- // left join(
- // select distinct A.eqp_code from TEqpmai_Eqp A
- // inner join TEqpInfo B on A.eqp_code=B.code
- // where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- // ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
sql = @"select * from(
select AA.code,AA.name,'E' as type,(case when BB.eapmai_code is null then 'N' else 'Y' end) flag,(case when AA.eapmai_code is null then 'N' else 'Y' end) flage1
from(
select A.code,A.name,'' as eapmai_code
from TEqpInfo A
- where A.wksp_code=@wkspcode and A.is_delete<>'1'
+ where A.torg_code=@wkspcode
) as AA
left join (
select A.code,A.name,B.eapmai_code
from TEqpInfo A
inner join TEqpmai_Eqp B on A.code=B.eqp_code
- where A.wksp_code=@wkspcode and B.eapmai_code=@repairstand_code and A.is_delete<>'1'
+ where A.torg_code=@wkspcode and B.eapmai_code=@repairstand_code
) as BB on AA.code=BB.code
- ) as CC "; //where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1
+ ) as CC";
dynamicParams.Add("@repairstand_code", repairstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -1515,14 +1841,14 @@
list.Add(rout);
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1530,70 +1856,45 @@
#endregion
#region [璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
- public static ToMessage SaveDeviceRepairStanedAssociationEqp(string stu_torgcode, string stu_torgtypecode, string repairstand_code, string username, List<ObjectData> json)
+ public static ToMessage SaveDeviceRepairStanedAssociationEqp(User us, string repairstand_code, List<ObjectData> json)
{
var sql = "";
List<object> list = new List<object>();
try
{
list.Clear();
- switch (stu_torgtypecode)
+ sql = @"delete TEqpmai_Eqp where eapmai_code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ //寰幆鍐欏叆璁惧淇濆吇鏍囧噯鍏宠仈璁惧琛�
+ for (int i = 0; i < json.Count; i++)
{
- case "":
- //娓呴櫎璁惧淇濆吇鏍囧噯鍏宠仈璁惧琛ㄦ暟鎹�
- sql = @"delete TEqpmai_Eqp where eapmai_code=@repairstand_code";
- list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
- break;
- case "D":
- //娓呴櫎璁惧淇濆吇鏍囧噯鍏宠仈璁惧琛ㄦ暟鎹�
- sql = @"delete from TEqpmai_Eqp where id in (select A.id from TEqpmai_Eqp A
- left join TOrganization T on A.torg_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where 1=1 and A.eapmai_code=@repairstand_code and L.org_code=@stu_torgcode)";
- list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code, stu_torgcode = stu_torgcode } });
- break;
- case "W":
- //娓呴櫎璁惧淇濆吇鏍囧噯鍏宠仈璁惧琛ㄦ暟鎹�
- sql = @"delete from TEqpmai_Eqp where id in (select A.id from TEqpmai_Eqp A
- left join TOrganization T on A.torg_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where 1=1 and A.eapmai_code=@repairstand_code and L.org_code=@stu_torgcode)";
- list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code, stu_torgcode = stu_torgcode } });
- break;
- }
- if (json != null && json.Count > 0)
- {
- //寰幆鍐欏叆璁惧淇濆吇鏍囧噯鍏宠仈璁惧琛�
- for (int i = 0; i < json.Count; i++)
+ sql = @"insert into TEqpmai_Eqp(eapmai_code,eqp_code,lm_user,lm_date,torg_code) values(@repairstand_code,@eqp_code,@lm_user,@lm_date,@torg_code)";
+ list.Add(new
{
- sql = @"insert into TEqpmai_Eqp(eapmai_code,eqp_code,lm_user,lm_date,torg_code) values(@repairstand_code,@eqp_code,@lm_user,@lm_date,@torg_code)";
- list.Add(new
+ str = sql,
+ parm = new
{
- str = sql,
- parm = new
- {
- eqp_code = json[i].code,
- repairstand_code = repairstand_code,
- lm_user = username,
- lm_date = DateTime.Now.ToString(),
- torg_code = json[i].flag
- }
- });
- }
+ eqp_code = json[i].code,
+ repairstand_code = repairstand_code,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString(),
+ torg_code = json[i].flag
+ }
+ });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
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;
}
}
@@ -1601,7 +1902,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1611,7 +1912,7 @@
#region[璁惧鐐规璁板綍鏌ヨ]
- public static ToMessage DeviceCheckTakeSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceCheckTakeSearch(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1619,22 +1920,8 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and T.org_code=@wkshopcode ";
+ search += "and T.torg_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- else
- {
- switch (description)
- {
- case "":
- search += "and T.description=@description ";
- dynamicParams.Add("@description", "W");
- break;
- case "D":
- search += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -1669,17 +1956,16 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.djwo,T.org_code,T.org_name,A.eqp_code,E.name as eqp_name,M.code as stanedcode,M.name as stanedname,
+ var sql = @"select A.djwo,T.torg_code,T.torg_name,A.eqp_code,E.name as eqp_name,M.code as stanedcode,M.name as stanedname,
A.chk_user,A.chk_result,A.chk_date
from TEqpchk_Proc_Main A
left join TEqpInfo E on A.eqp_code=E.code
left join TEqpchk_Main M on A.eqpchkmain_code=M.code
- left join TOrganization T on E.wksp_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where T.description='W' " + search;
+ left join TOrganization T on E.torg_code=T.torg_code
+ where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1687,7 +1973,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1709,14 +1995,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1724,7 +2010,7 @@
#endregion
#region[璁惧鐐规璁板綍瀵煎嚭]
- public static ToMessage DeviceCheckTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
+ public static ToMessage DeviceCheckTakeOutExcel(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1732,22 +2018,8 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and T.org_code=@wkshopcode ";
+ search += "and T.torg_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- else
- {
- switch (description)
- {
- case "":
- search += "and T.description=@description ";
- dynamicParams.Add("@description", "W");
- break;
- case "D":
- search += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -1787,7 +2059,7 @@
ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.eqpchkdeta_code) = 1 THEN A.djwo
ELSE ''END AS '鐐规鍗曞彿',
CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY E.wksp_code ORDER BY B.eqpchkdeta_code) = 1 THEN T.org_name
+ ROW_NUMBER() OVER (PARTITION BY E.torg_code ORDER BY B.eqpchkdeta_code) = 1 THEN T.torg_name
ELSE ''END AS '鐢熶骇杞﹂棿',
CASE WHEN
ROW_NUMBER() OVER (PARTITION BY A.eqp_code ORDER BY B.eqpchkdeta_code) = 1 THEN A.eqp_code
@@ -1815,15 +2087,14 @@
left join TEqpchk_Proc_Deta B on A.djwo=B.djwo
left join TEqpInfo E on A.eqp_code=E.code
left join TEqpchk_Main M on A.eqpchkmain_code=M.code
- left join TOrganization T on E.wksp_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
+ left join TOrganization T on E.torg_code=T.torg_code
left join TEqpchk_Item H on B.eqpchkdeta_code=H.code
- where T.description='W' " + search;
+ where 1=1 " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -1831,7 +2102,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1841,7 +2112,7 @@
#region[璁惧淇濆吇璁板綍鏌ヨ]
- public static ToMessage DeviceCheckTakeSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceCheckTakeSearch(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1849,22 +2120,8 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and T.org_code=@wkshopcode ";
+ search += "and T.torg_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- else
- {
- switch (description)
- {
- case "":
- search += "and T.description=@description ";
- dynamicParams.Add("@description", "W");
- break;
- case "D":
- search += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -1904,17 +2161,16 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.bywo,T.org_code,T.org_name,A.eqp_code,E.name as eqp_name,M.code as stanedcode,M.name as stanedname,A.maint_cyc,
+ var sql = @"select A.bywo,T.torg_code,T.torg_name,A.eqp_code,E.name as eqp_name,M.code as stanedcode,M.name as stanedname,A.maint_cyc,
A.maint_user,A.maint_result,A.maint_date
from TEqpmaint_Proc_Main A
left join TEqpInfo E on A.eqp_code=E.code
left join TEqpmai_Main M on A.eqpmaint_code=M.code
- left join TOrganization T on E.wksp_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where T.description='W' " + search;
+ left join TOrganization T on E.torg_code=T.torg_code
+ where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1922,7 +2178,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1944,14 +2200,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1959,7 +2215,7 @@
#endregion
#region[璁惧淇濆吇璁板綍瀵煎嚭]
- public static ToMessage DeviceRepairTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
+ public static ToMessage DeviceRepairTakeOutExcel(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1967,22 +2223,8 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and T.org_code=@wkshopcode ";
+ search += "and T.torg_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- else
- {
- switch (description)
- {
- case "":
- search += "and T.description=@description ";
- dynamicParams.Add("@description", "W");
- break;
- case "D":
- search += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2027,7 +2269,7 @@
ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.eqpmaideta_code) = 1 THEN A.bywo
ELSE ''END AS '淇濆吇鍗曞彿',
CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY E.wksp_code ORDER BY B.eqpmaideta_code) = 1 THEN T.org_name
+ ROW_NUMBER() OVER (PARTITION BY E.torg_code ORDER BY B.eqpmaideta_code) = 1 THEN T.torg_name
ELSE ''END AS '鐢熶骇杞﹂棿',
CASE WHEN
ROW_NUMBER() OVER (PARTITION BY A.eqp_code ORDER BY B.eqpmaideta_code) = 1 THEN A.eqp_code
@@ -2058,15 +2300,14 @@
left join TEqpmaint_Proc_Deta B on A.bywo=B.bywo
left join TEqpInfo E on A.eqp_code=E.code
left join TEqpmai_Main M on A.eqpmaint_code=M.code
- left join TOrganization T on E.wksp_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
+ left join TOrganization T on E.torg_code=T.torg_code
left join TEqpmai_Item H on B.eqpmaideta_code=H.code
- where T.description='W' " + search;
+ where 1=1 " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -2074,7 +2315,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2084,7 +2325,7 @@
#region[璁惧缁翠慨璁板綍鏌ヨ]
- public static ToMessage DeviceUpdateSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceUpdateSearch(User us, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -2094,20 +2335,6 @@
{
search += "and A.wksp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- else
- {
- switch (description)
- {
- case "":
- search += "and T.description=@description ";
- dynamicParams.Add("@description", "W");
- break;
- case "D":
- search += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2160,18 +2387,17 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.repair_code,A.wksp_code,T.org_name as wksp_name,A.eqp_code,E.name as eqp_name,B.request_person,B.request_date,
+ var sql = @"select A.repair_code,A.wksp_code,T.torg_name as wksp_name,A.eqp_code,E.name as eqp_name,B.request_person,B.request_date,
A.repair_person,A.repair_date,CAST(datediff(minute, B.request_date,A.repair_date)/60.0 AS decimal(9,1)) as cycleDate,
A.verify_person,A.verify_date,(case when A.verify_result='OK' then '閫氳繃' when A.verify_result='NG' then '涓嶉�氳繃' end)as verify_result
from TEqp_Repair A
left join TEqp_RepairRequest B on A.source_wo=B.docu_code
left join TEqpInfo E on A.eqp_code=E.code
- left join TOrganization T on A.wksp_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where T.description='W' " + search;
+ left join TOrganization T on A.wksp_code=T.torg_code
+ where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2179,7 +2405,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2239,14 +2465,14 @@
repair.repairimage = data3;
Dict.Add("data2", repair);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = Dict;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2254,7 +2480,7 @@
#endregion
#region[璁惧缁翠慨璁板綍瀵煎嚭]
- public static ToMessage DeviceUpdateOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
+ public static ToMessage DeviceUpdateOutExcel(User us, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -2264,20 +2490,6 @@
{
search += "and A.wksp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- else
- {
- switch (description)
- {
- case "":
- search += "and T.description=@description ";
- dynamicParams.Add("@description", "W");
- break;
- case "D":
- search += "and L.org_code=@stu_torgcode ";
- dynamicParams.Add("@stu_torgcode", stu_torgcode);
- break;
- }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2332,7 +2544,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select
A.repair_code as '缁翠慨鍗曞彿',
- T.org_name as '鎵�灞炶溅闂�',
+ T.torg_name as '鎵�灞炶溅闂�',
A.eqp_code as '璁惧缂栫爜',
E.name as '璁惧鍚嶇О',
B.request_person as '鎶ヤ慨浜哄憳',
@@ -2346,14 +2558,13 @@
from TEqp_Repair A
left join TEqp_RepairRequest B on A.source_wo=B.docu_code
left join TEqpInfo E on A.eqp_code=E.code
- left join TOrganization T on A.wksp_code=T.org_code
- left join TOrganization as L on T.parent_id=L.id
- where T.description='W'" + search;
+ left join TOrganization T on A.wksp_code=T.torg_code
+ where 1=1 " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "璁惧缁翠慨璁板綍");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -2361,374 +2572,11 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
}
#endregion
-
-
-
-
-
-
-
- #region[璁惧绫诲瀷鏌ヨ]
- public static ToMessage DeviceTypeSearch(int startNum, int endNum, string prop, string order)
- {
- var dynamicParams = new DynamicParameters();
- try
- {
- // --------------鏌ヨ鎸囧畾鏁版嵁--------------
- var total = 0; //鎬绘潯鏁�
- var sql = @"select id, code,name,remark
- from TEqpType";
- 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 AddUpdateDeviceType(List<ObjectDataCont> json, User us)
- {
- var sql = "";
- List<object> list = new List<object>();
- var dynamicParams = new DynamicParameters();
- try
- {
- list.Clear();
- //寰幆鍐欏叆璁惧绫诲瀷琛�
- for (int i = 0; i < json.Count; i++)
- {
- sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = json[i].code,
- name = json[i].name,
- username = us.usercode,
- createdate = DateTime.Now.ToString(),
- description = json[i].description
- }
- });
- }
- bool aa = DapperHelper.DoTransaction(list);
- if (aa)
- {
- //鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
- 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 DeleteDeviceType(string devicetypecode, User us)
- {
- var sql = "";
- List<object> list = new List<object>();
- var dynamicParams = new DynamicParameters();
- try
- {
- list.Clear();
- //鍒ゆ柇璁惧鏈夋棤鍏宠仈璁惧绫诲瀷
- sql = @"select * from TEqpInfo where eqptype_code=@devicetypecode";
- dynamicParams.Add("@devicetypecode", devicetypecode);
- var data0 = DapperHelper.selectdata(sql, dynamicParams);
- if (data0.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "褰撳墠璁惧绫诲瀷宸叉湁鍏宠仈璁惧,涓嶅厑璁稿垹闄�!";
- mes.data = null;
- }
- else
- {
- sql = @"delete TEqpType where code=@devicetypecode";
- list.Add(new { str = sql, parm = new { devicetypecode = devicetypecode } });
- bool aa = DapperHelper.DoTransaction(list);
- if (aa)
- {
- //鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚澶囩被鍨�:" + devicetypecode, us.usertype);
- 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 DeviceMangerSearch(string devicecode, string devicename, string status, string storgcode, string devicetype, int startNum, int endNum, string prop, string order)
- {
- var dynamicParams = new DynamicParameters();
- string search = "";
- try
- {
- if (devicecode != "" && devicecode != null)
- {
- search += "and A.code like '%'+@devicecode+'%' ";
- dynamicParams.Add("@devicecode", devicecode);
- }
- if (devicename != "" && devicename != null)
- {
- search += "and A.name like '%'+@devicename+'%' ";
- dynamicParams.Add("@devicename", devicename);
- }
- if (status != "" && status != null)
- {
- search += "and A.enable=@status ";
- dynamicParams.Add("@status", status);
- }
- if (storgcode != "" && storgcode != null)
- {
- search += "and A.torg_code=@storgcode ";
- dynamicParams.Add("@storgcode", storgcode);
- }
- if (devicetype != "" && devicetype != null)
- {
- search += "and A.eqptype_code=@devicetype ";
- dynamicParams.Add("@devicetype", devicetype);
- }
- // --------------鏌ヨ鎸囧畾鏁版嵁--------------
- var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.code,A.name,A.eqptype_code,B.name as eqptype_name,A.enable,A.torg_code,T.torg_name,A.opc_uom,U.username as lm_user,A.lm_date
- from TEqpInfo A
- left join TEqpType B on A.eqptype_code=B.code
- left join TOrganization T on A.torg_code=T.torg_code
- left join TUser U on A.lm_user=U.usercode
- where 1=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 AddUpdateDeviceManger(string devicecode, string devicename, string devicetype, string storgcode, string status, string OperType, User us)
- {
- var dynamicParams = new DynamicParameters();
- string sql = "";
- try
- {
- if (OperType == "Add")
- {
- //鍒ゆ柇璁惧缂栫爜鏄惁閲嶅
- sql = @"select * from TEqpInfo where code=@devicecode";
- dynamicParams.Add("@devicecode", devicecode);
- 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 = @"select * from TEqpInfo where name=@devicename";
- dynamicParams.Add("@devicename", devicename);
- var data1 = DapperHelper.selectdata(sql, dynamicParams);
- if (data1.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
- mes.data = null;
- return mes;
- }
-
- sql = @"insert into TEqpInfo(code,name,eqptype_code,torg_code,enable,opc_uom,lm_user,lm_date)
- values(@devicecode,@devicename,@devicetype,@torg_code,@status,@uom,@usercode,@CreateDate)";
- dynamicParams.Add("@devicecode", devicecode);
- dynamicParams.Add("@devicename", devicename);
- dynamicParams.Add("@devicetype", devicetype);
- dynamicParams.Add("@torg_code", storgcode);
- dynamicParams.Add("@status", status);
- dynamicParams.Add("@uom", "鍙�");
- dynamicParams.Add("@usercode", us.usercode);
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- int cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
- {
- //鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶�:" + devicecode, us.usertype);
- 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 = @"select * from TEqpInfo where code<>@code and name=@name";
- dynamicParams.Add("@code", devicecode);
- dynamicParams.Add("@name", devicename);
- var data1 = DapperHelper.selectdata(sql, dynamicParams);
- if (data1.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
- mes.data = null;
- return mes;
- }
- sql = @"update TEqpInfo set name=@devicename,eqptype_code=@devicetype,torg_code=@torg_code,enable=@status,lm_user=@usercode,lm_date=@CreateDate
- where code=@devicecode";
- dynamicParams.Add("@devicecode", devicecode);
- dynamicParams.Add("@devicename", devicename);
- dynamicParams.Add("@devicetype", devicetype);
- dynamicParams.Add("@torg_code", storgcode);
- dynamicParams.Add("@status", status);
- dynamicParams.Add("@usercode", us.usercode);
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- int cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
- {
- //鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚澶�:" + devicecode, us.usertype);
- 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 DeleteDeviceManger(string devicecode,User us)
- {
- var sql = "";
- List<object> list = new List<object>();
- var dynamicParams = new DynamicParameters();
- try
- {
- list.Clear();
- //鍒ゆ柇璁惧鏄惁鏈夊紑鎶ュ伐,涓嶅厑璁稿垹闄�
-
- //鍒犻櫎璁惧
- sql = @"delete TEqpInfo where code=@devicecode";
- list.Add(new { str = sql, parm = new { devicecode = devicecode } });
- bool aa = DapperHelper.DoTransaction(list);
- if (aa)
- {
- //鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚澶�:" + devicecode, us.usertype);
- 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
-
-
}
}
--
Gitblit v1.9.3