From f10feb72cae8d10d2e05ca8919b791a8f38dd763 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 03 十一月 2022 18:01:51 +0800
Subject: [PATCH] 安灯报表报错问题修改 设备点检标准导入，模板验证、数据验证接口开发
---
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 207 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 167 insertions(+), 40 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index af0faf6..3c15a46 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -383,8 +383,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)
@@ -466,13 +466,13 @@
for (int i = 0; i < files.Count; i++)
{
HttpPostedFile file = files[i];
- string imgName = DateTime.Now.ToString("yyyyMMddhhmmss");
+ string imgName = DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
string imgPath = "/DeviceImage/image1/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
string AbsolutePath = System.Web.HttpContext.Current.Server.MapPath(imgPath);
file.SaveAs(AbsolutePath); //灏嗕笂浼犵殑涓滆タ淇濆瓨
//寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
- sql = @"insert into TEqp_RepairImage(source_wo,wo_type,img1_url)
- values(@source_wo,@wo_type,@img1_url)";
+ sql = @"insert into TEqp_RepairImage(source_wo,wo_type,img1url)
+ values(@source_wo,@wo_type,@img1url)";
list.Add(new
{
str = sql,
@@ -480,7 +480,7 @@
{
source_wo = wxwo,
wo_type = "REPA",
- img1_url = imgPath
+ img1url = imgPath
}
});
}
@@ -538,7 +538,7 @@
#region[璁惧缁翠慨鍒楄〃]
- public static ToMessage RepairScanDeviceQrCodeData()
+ public static ToMessage RepairScanDeviceQrCodeDataList()
{
string sql = "";
try
@@ -579,7 +579,7 @@
#endregion
#region[璁惧缁翠慨鎻愪氦]
- public static ToMessage RepairScanDeviceSave(string username, string eqpcode, string wkshpcode, string faultdescr, string is_stoprepair, string repaircontent, string replaceparts, HttpFileCollection files)
+ public static ToMessage RepairScanDeviceSave(string docu_code, string username, string eqpcode, string wkshpcode, string faultdescr, string is_stoprepair, string repaircontent, string replaceparts, HttpFileCollection files)
{
var sql = "";
string wxwo = "", numvalue = "";
@@ -606,8 +606,8 @@
{
string imgPath1 = "", imgPath2 = "", AbsolutePath = "";
HttpPostedFile file = files[i];
- string imgName = DateTime.Now.ToString("yyyyMMddhhmmss");
- string keyname = files.AllKeys[i].ToString();
+ string imgName = DateTime.Now.ToString("yyyyMMddhhmmss") + 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,11 +618,10 @@
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,img1_url,img2_url)
- values(@source_wo,@wo_type,@img1_url,@img2_url)";
+ sql = @"insert into TEqp_RepairImage(source_wo,wo_type,img1url,img2url)
+ values(@source_wo,@wo_type,@img1url,@img2url)";
list.Add(new
{
str = sql,
@@ -630,15 +629,15 @@
{
source_wo = wxwo,
wo_type = "COMP",
- img1_url = imgPath1,
- img2_url = imgPath2
+ img1url = imgPath1,
+ img2url = imgPath2
}
});
}
}
//鍐欏叆缁翠慨璁板綍琛�
- sql = @"insert into TEqp_Repair(repair_code,docu_date,status,wksp_code,eqp_code,repair_person,repair_date,repair_content,repair_part,failure_descript,is_shutdown)
- values(@repair_code,@docu_date,@status,@wksp_code,@eqp_code,@repair_person,@repair_date,@repair_content,@repair_part,@failure_descript,@is_shutdown)";
+ sql = @"insert into TEqp_Repair(repair_code,docu_date,status,wksp_code,eqp_code,repair_person,repair_date,repair_content,repair_part,failure_descript,is_shutdown,source_wo)
+ values(@repair_code,@docu_date,@status,@wksp_code,@eqp_code,@repair_person,@repair_date,@repair_content,@repair_part,@failure_descript,@is_shutdown,@source_wo)";
list.Add(new
{
str = sql,
@@ -654,9 +653,13 @@
repair_content = repaircontent,
repair_part = replaceparts,
failure_descript = faultdescr,
- is_shutdown = is_stoprepair
+ is_shutdown = is_stoprepair,
+ source_wo = docu_code
}
});
+ //鏇存柊缁翠慨鐢宠鍗曠姸鎬�
+ sql = @"update TEqp_RepairRequest set status=@status where docu_code=@docu_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ list.Add(new { str = sql, parm = new { docu_code = docu_code, wkshpcode = wkshpcode, eqpcode = eqpcode, status = "COMP" } });
//鍥炲啓瀛楀吀琛�,鏇存柊褰撳墠娴佹按鍙�
sql = @"update T_CodeRules set value=@cunm2 where rightcode=@RightCode";
@@ -731,7 +734,7 @@
#endregion
#region[缁翠慨楠岃瘉璇︽儏淇℃伅]
- public static ToMessage RepairVerificationScanDeviceDataSub(string eqpcode, string wkshpcode)
+ public static ToMessage RepairVerificationScanDeviceDataSub(string repair_code, string eqpcode, string wkshpcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -741,7 +744,8 @@
//鏍规嵁璁惧缂栫爜\杞﹂棿缂栫爜鑾峰彇缁翠慨璇︽儏
sql = @"select repair_code,failure_descript,is_shutdown,repair_content,repair_part
from TEqp_Repair
- where wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ where repair_code=@repair_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ dynamicParams.Add("@repair_code", repair_code);
dynamicParams.Add("@wkshpcode", wkshpcode);
dynamicParams.Add("@eqpcode", eqpcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -763,7 +767,7 @@
dict.Add("repair_part", data.Rows[0]["repair_part"].ToString()); //鏇存崲澶囦欢
//鑾峰彇鏇存崲澶囦欢涓婁紶鍥剧墖
- sql = @"select img1ur2 from TEqp_RepairImage where source_wo=@source_wo and wo_type='COMP'";
+ sql = @"select img2url from TEqp_RepairImage where source_wo=@source_wo and wo_type='COMP'";
dynamicParams.Add("@source_wo", data.Rows[0]["repair_code"].ToString());
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)
@@ -798,9 +802,14 @@
{
var sql = "";
List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
list.Clear();
+ //鏍规嵁璁惧缁翠慨鍗曟煡鎵炬簮鍗�(缁翠慨鐢宠鍗�)
+ sql = @"select source_wo from TEqp_Repair where repair_code=@repairwo";
+ dynamicParams.Add("@repairwo", repairwo);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
//鏇存柊璁惧缁翠慨璁板綍楠岃瘉浜哄憳銆侀獙璇佹椂闂淬�侀獙璇佺粨鏋溿�侀獙璇佺姸鎬�
sql = @"update TEqp_Repair set status=@status,is_verifi=@is_verifi,verify_result=@verify_result,verify_person=@verify_person,verify_date=@verify_date
where repair_code=@repair_code and wksp_code=@wksp_code and eqp_code=@eqp_code";
@@ -811,14 +820,17 @@
{
status = "CONFIR",
is_verifi = "Y",
- verify_result=result,
- verify_person=username,
- verify_date= DateTime.Now.ToString(),
- repair_code=repairwo,
- wksp_code=wkshpcode,
- eqp_code=eqpcode
+ verify_result = result,
+ verify_person = username,
+ verify_date = DateTime.Now.ToString(),
+ repair_code = repairwo,
+ wksp_code = wkshpcode,
+ eqp_code = eqpcode
}
});
+ //鏇存柊缁翠慨鐢宠鍗曠姸鎬�
+ sql = @"update TEqp_RepairRequest set status=@status where docu_code=@docu_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ list.Add(new { str = sql, parm = new { docu_code = data.Rows[0]["source_wo"].ToString(), wkshpcode = wkshpcode, eqpcode = eqpcode, status = "CONFIR" } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -897,10 +909,16 @@
try
{
//鏍规嵁杞﹂棿浠ｇ爜鏌ユ壘鍛煎彨绫诲瀷鏁版嵁
- sql = @"select A.id,B.code,B.name from TAnDon_Roul_ConFig A
+ sql = @"select A.id,B.code,B.name,(case when F.type is null then 'N' else 'Y' end) flag
+ from TAnDon_Roul_ConFig A
inner join TAnDonType B on A.andotype_code=B.code
- where A.wkshp_code=@wkshpcode and A.enable='N'";
+ inner join TEqpInfo E on A.wkshp_code=e.wksp_code
+ left join(
+ select type,wkshp_code,eqp_code from TAnDon_Task_Info where eqp_code=@eqpcode and wkshp_code=@wkshpcode and status='START'
+ ) F on A.wkshp_code=F.wkshp_code and E.code=F.eqp_code and B.code=F.type
+ where A.wkshp_code=@wkshpcode and E.code=@eqpcode and A.enable='N'";
dynamicParams.Add("@wkshpcode", wkshpcode);
+ dynamicParams.Add("@eqpcode", eqpcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
@@ -909,9 +927,10 @@
AnDnDate mn = new AnDnDate();
mn.code = data.Rows[i]["CODE"].ToString();
mn.name = data.Rows[i]["NAME"].ToString();
+ mn.flag = data.Rows[i]["FLAG"].ToString();
mn.children = new List<AnDnDateSub>();
//鏍规嵁鍛煎彨绫诲瀷id鏌ユ壘缁戝畾浜哄憳
- sql = @"select U.usercode,U.username
+ sql = @"select U.usercode,U.username,U.rid
from TAnDon_Roul_ConFigUser A
inner join TUser U on A.usercode=U.usercode
where A.ando_cogfigid=@id";
@@ -922,6 +941,8 @@
for (int j = 0; j < data0.Rows.Count; j++)
{
AnDnDateSub sn = new AnDnDateSub();
+ sn.rid= data0.Rows[j]["RID"].ToString();//rid
+ sn.alias = data0.Rows[j]["RID"].ToString() + data0.Rows[j]["USERCODE"].ToString(); //鍒悕
sn.usercode = data0.Rows[j]["USERCODE"].ToString();
sn.username = data0.Rows[j]["USERNAME"].ToString();
mn.children.Add(sn);
@@ -955,16 +976,19 @@
public static ToMessage AppDeviceAnDengCallSave(string username, string eqpcode, string wkshpcode, List<AnDnDate> json)
{
string sql = "";
+ int AnDnID = 0; //鏈�澶d
var dynamicParams = new DynamicParameters();
List<object> list = new List<object>();
+ List<string> list1 = new List<string>();
ChatHub chthub = new ChatHub();
try
{
list.Clear();
- //鎵ц娑堟伅鎺ㄩ��
- chthub.SendByGroupList(username, wkshpcode, eqpcode, json);
- for (int i = 1; i <= json.Count; i++)
+ //鑾峰彇涓昏〃鏈�澶D
+ AnDnID = DapperHelper.insertReturnId("TAnDon_Task_Info");
+ for (int i = 0; i < json.Count; i++)
{
+ AnDnID = AnDnID + 1;//鑷1
string code = json[i].code.ToString();
string name = json[i].name.ToString();
sql = @"select * from TAnDon_Task_Info where wkshp_code=@wkshpcode and eqp_code=@eqpcode and type=@typecode and status='START'";
@@ -981,10 +1005,6 @@
}
else
{
- //鑾峰彇涓昏〃鏈�澶D
- sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+@num,1) as id";
- dynamicParams.Add("@num", i);
- var dt = DapperHelper.selectdata(sql, dynamicParams);
//鍐欏叆瀹夌伅鍛煎彨琛�
sql = @"insert into TAnDon_Task_Info(wkshp_code,eqp_code,type,start_date,start_user,status)
values(@wkshp_code,@eqp_code,@type,@start_date,@start_user,@status)";
@@ -1001,27 +1021,32 @@
status = "START"
}
});
+
for (int j = 0; j < json[i].children.Count; j++)
{
//鍐欏叆瀹夌伅璁板綍鎺ㄩ�佷汉鍛樿〃
sql = @"insert into TAnDnMessagePush(m_id,wkshp_code,eqp_code,type,resp_user,status)
- values(@m_id,@wkshp_code,@eqp_code,@type,@start_date,@start_user,@status)";
+ values(@m_id,@wkshp_code,@eqp_code,@type,@resp_user,@status)";
list.Add(new
{
str = sql,
parm = new
{
- m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
+ m_id = AnDnID,
+ //m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
wkshp_code = wkshpcode,
eqp_code = eqpcode,
type = code,
- resp_user = json[i].children[i].usercode,
+ resp_user = json[i].children[j].usercode,
+ alias= json[i].children[j].alias,
status = "N"
}
});
}
}
}
+ //鏋佸厜鎺ㄩ��
+ mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -1051,5 +1076,107 @@
#endregion
+
+ #region[瀹夌伅鍝嶅簲鎵弿宸ヤ綅/璁惧]
+ public static ToMessage AppDeviceAnDengLampResponseScanSearch(string eqpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲璁惧鍙婃墍灞炶溅闂寸殑瀹夌伅鍛煎彨璁板綍
+ sql = @"select A.eqp_code,B.name as eqp_name,T.org_code as wksp_code,T.org_name as wksp_name,A.type as typecode,D.name as typename
+ from TAnDon_Task_Info A
+ left join TEqpInfo B on A.eqp_code=B.code
+ left join TOrganization T on B.wksp_code=T.org_code
+ left join TAnDonType D on A.type=D.code
+ where A.eqp_code=@eqpcode and A.status='START' and B.enable='Y' and T.description='W' ";
+ 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 AppDeviceAnDengLampResponseSave(string username, string eqpcode, string wkshpcode, List<ObjectData> json)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ ChatHub chthub = new ChatHub();
+ try
+ {
+ list.Clear();
+ for (int i = 0; i <json.Count; i++)
+ {
+ string code = json[i].code.ToString();
+ string name = json[i].name.ToString();
+ //鏇存柊瀹夌伅鍛煎彨琛�
+ sql = @"update TAnDon_Task_Info set resp_user=@resp_user,resp_date=@resp_date,status='CLOSED',taking=cast ( cast ( datediff ( ss, start_date, @resp_date) / ( 60 * 60 * 24 ) as int ) as varchar ) + '澶�' +
+ cast ( cast ( datediff ( ss, start_date, @resp_date ) % 86400 / 3600 as int ) as varchar ) + '灏忔椂' +
+ cast ( cast ( datediff ( ss, start_date, @resp_date ) % 3600 / 60 as int ) as varchar ) + '鍒�' +
+ cast ( cast ( datediff ( ss, start_date, @resp_date ) % 60 as int ) as varchar ) + '绉�'
+ where wkshp_code=@wkshp_code and eqp_code=@eqp_code and type=@type and status='START'";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wkshp_code = wkshpcode,
+ eqp_code = eqpcode,
+ type = code,
+ resp_date = DateTime.Now.ToString(),
+ resp_user = username,
+ status = "START"
+ }
+ });
+ }
+ 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
--
Gitblit v1.9.3