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/DeviceManagerDAL.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index e40351b..92876b2 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -1351,9 +1351,8 @@
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,B.eqpchkmain_code
+ select A.code,A.name,'' as eqpchkmain_code
from TEqpInfo A
- left join TEqpchk_Eqp B on A.code=B.eqp_code
where A.wksp_code=@wkspcode and A.is_delete<>'1'
) as AA
left join (
@@ -1362,7 +1361,7 @@
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'
) 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 "; //where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1
dynamicParams.Add("@checkstand_code", checkstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -1789,9 +1788,8 @@
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,B.eapmai_code
+ select A.code,A.name,'' as eapmai_code
from TEqpInfo A
- left join TEqpmai_Eqp B on A.code=B.eqp_code
where A.wksp_code=@wkspcode and A.is_delete<>'1'
) as AA
left join (
@@ -1800,7 +1798,7 @@
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'
) 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 "; //where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1
dynamicParams.Add("@repairstand_code", repairstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -1855,6 +1853,7 @@
//寰幆鍐欏叆璁惧淇濆吇鏍囧噯鍏宠仈璁惧琛�
for (int i = 0; i < json.Count; i++)
{
+ list.Add(new { str = sql, parm = new { eqp_code = json[i].code } });
sql = @"insert into TEqpmai_Eqp(eapmai_code,eqp_code,lm_user,lm_date) values(@repairstand_code,@eqp_code,@lm_user,@lm_date)";
list.Add(new
{
@@ -2438,7 +2437,7 @@
//鑾峰彇璁惧缁翠慨鏁版嵁
sql = @"select A.failure_descript,A.is_shutdown,A.repair_content,A.repair_part from TEqp_Repair A
left join TEqp_RepairRequest B on A.source_wo=B.docu_code
- where A.repair_code='SBWX221010016'";
+ where A.repair_code=@repair_code";
dynamicParams.Add("@repair_code", repair_code);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
DeviceRepair repair = new DeviceRepair();
@@ -2449,7 +2448,7 @@
//鑾峰彇璁惧缁翠慨鍥剧墖鏁版嵁
sql = @"select M.img1url,M.img2url from TEqp_Repair A
left join TEqp_RepairImage M on A.repair_code=M.source_wo
- where A.repair_code='SBWX221010016' and M.wo_type='COMP'";
+ where A.repair_code=@repair_code and M.wo_type='COMP'";
dynamicParams.Add("@repair_code", repair_code);
var data3 = DapperHelper.selectdata(sql, dynamicParams);
repair.repairimage = data3;
--
Gitblit v1.9.3