From dd651f9ce0156fc7db869da04e0c2004a1811c52 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 25 十月 2022 21:00:36 +0800
Subject: [PATCH] 安灯报表开发
---
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 12d211a..86c7ecc 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -655,12 +655,12 @@
repair_part = replaceparts,
failure_descript = faultdescr,
is_shutdown = is_stoprepair,
- source_wo= docu_code
+ 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" } });
+ 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";
@@ -735,7 +735,7 @@
#endregion
#region[缁翠慨楠岃瘉璇︽儏淇℃伅]
- public static ToMessage RepairVerificationScanDeviceDataSub(string repair_code,string eqpcode, string wkshpcode)
+ public static ToMessage RepairVerificationScanDeviceDataSub(string repair_code, string eqpcode, string wkshpcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -914,7 +914,9 @@
from TAnDon_Roul_ConFig A
inner join TAnDonType B on A.andotype_code=B.code
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
+ 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);
@@ -973,16 +975,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'";
@@ -999,10 +1004,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)";
@@ -1019,6 +1020,7 @@
status = "START"
}
});
+
for (int j = 0; j < json[i].children.Count; j++)
{
//鍐欏叆瀹夌伅璁板綍鎺ㄩ�佷汉鍛樿〃
@@ -1029,17 +1031,20 @@
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,
status = "N"
}
});
}
}
}
+ //鏋佸厜鎺ㄩ��
+ //mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
--
Gitblit v1.9.3