From 4e2ad6fb29941fb759de11697db680012ab5d06d Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 10 一月 2023 16:26:09 +0800
Subject: [PATCH] 设备保养关联工作接口查询、提交修改
---
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 94 insertions(+), 17 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 3a26ff4..bf744a3 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -61,8 +61,46 @@
}
#endregion
+ #region[鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮佹煡鎵剧偣妫�鏍囧噯]
+ public static ToMessage CheckScanDeviceTemp(string eqpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲璁惧鐐规鏍囧噯
+ sql = @"select M.code,M.name from TEqpchk_Eqp E
+ inner join TEqpchk_Main M on E.eqpchkmain_code=M.code
+ where E.eqp_code=@eqpcode order by M.lm_date desc";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ 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 SelectScanDeviceQrCodeItem(string eqpcode)
+ public static ToMessage SelectScanDeviceQrCodeItem(string eqpcode,string checktempcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -73,9 +111,10 @@
from TEqpchk_Eqp A
inner join TEqpchk_Main B on A.eqpchkmain_code=B.code
inner join TEqpchk_Deta S on B.code=S.eqpchk_main_code
- where A.eqp_code=@eqpcode
+ where A.eqp_code=@eqpcode and B.code=@checktempcode
order by S.seq asc";
dynamicParams.Add("@eqpcode", eqpcode);
+ dynamicParams.Add("@checktempcode", checktempcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
@@ -239,20 +278,18 @@
}
#endregion
- #region[鏃ュ父淇濆吇,閫夋嫨鎵爜璁惧鍒楄〃甯﹀嚭淇濆吇椤筣
- public static ToMessage RepairSelectScanDeviceQrCodeItem(string eqpcode)
+ #region[瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮佹煡鎵句繚鍏绘爣鍑哴
+ public static ToMessage RepairScanDeviceTemp(string eqpcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
try
{
- //鑾峰彇瀵瑰簲璁惧鍏宠仈鐨勪繚鍏婚」鐩�
- sql = @"select S.seq,S.code,S.name,S.chk_desc,S.isscan,B.main_cycle
- from TEqpmai_Eqp A
- inner join TEqpmai_Main B on A.eapmai_code=B.code
- inner join TEqpmai_Deta S on B.code=S.eapmai_code
- where A.eqp_code=@eqpcode
- order by S.seq asc";
+ //鑾峰彇瀵瑰簲璁惧淇濆吇鏍囧噯
+ sql = @"select M.code,M.name,main_cycle from TEqpmai_Eqp E
+ inner join TEqpmai_Main M on E.eapmai_code=M.code
+ where E.eqp_code=@eqpcode
+ order by M.lm_date desc";
dynamicParams.Add("@eqpcode", eqpcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
@@ -264,7 +301,48 @@
else
{
mes.code = "300";
- mes.Message = "褰撳墠璁惧鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰!";
+ 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 RepairSelectScanDeviceQrCodeItem(string eqpcode,string repartempcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲璁惧鍏宠仈鐨勪繚鍏婚」鐩�
+ sql = @"select S.seq,S.code,S.name,S.chk_desc,S.isscan,B.main_cycle
+ from TEqpmai_Eqp A
+ inner join TEqpmai_Main B on A.eapmai_code=B.code
+ inner join TEqpmai_Deta S on B.code=S.eapmai_code
+ where A.eqp_code='SB003' and B.code=@repartempcode
+ order by S.seq asc";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ dynamicParams.Add("@repartempcode", repartempcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠璁惧鏈缃繚鍏绘爣鍑嗙粦瀹氱偣妫�椤圭洰!";
mes.data = data;
}
}
@@ -383,8 +461,8 @@
var dynamicParams = new DynamicParameters();
try
{
- //鑾峰彇褰撳墠鎵爜璁惧鏄惁鐢宠缁翠慨璁板綍
- sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status='REPA' or status='COMP'";
+ //鑾峰彇褰撳墠鎵爜璁惧鏄惁瀛樺湪宸茬敵璇锋垨宸茬淮淇姸鎬佹暟鎹�
+ sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status<>'CONFIR'";
dynamicParams.Add("@eqpcode", eqpcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0)
@@ -607,7 +685,7 @@
string imgPath1 = "", imgPath2 = "", AbsolutePath = "";
HttpPostedFile file = files[i];
string imgName = DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
- string keyname = files.AllKeys[i].ToString();
+ string keyname = files.AllKeys[i].ToString().Substring(0, files.AllKeys[i].ToString().IndexOf(";"));
if (keyname == "files1")
{
imgPath1 = "/DeviceImage/image1/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
@@ -618,7 +696,6 @@
imgPath2 = "/DeviceImage/image2/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
AbsolutePath = System.Web.HttpContext.Current.Server.MapPath(imgPath2);
}
-
file.SaveAs(AbsolutePath); //灏嗕笂浼犵殑涓滆タ淇濆瓨
//寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
sql = @"insert into TEqp_RepairImage(source_wo,wo_type,img1url,img2url)
@@ -1128,7 +1205,7 @@
try
{
list.Clear();
- for (int i = 1; i <= json.Count; i++)
+ for (int i = 0; i <json.Count; i++)
{
string code = json[i].code.ToString();
string name = json[i].name.ToString();
--
Gitblit v1.9.3