From 4f57c3e602eef9ec929a2315183fa28b21cd0987 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 三月 2023 10:51:33 +0800
Subject: [PATCH] 订单下达获取工单语句修改、生产工单手工创建获取单据号接口
---
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index e40351b..930c240 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -1286,7 +1286,9 @@
//鍒犻櫎璁惧鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
sql = @"delete TEqpchk_Deta where eqpchk_main_code=@checkstand_code";
list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
-
+ //鍒犻櫎璁惧鐐规鏍囧噯鍏宠仈璁惧琛�
+ sql = @"delete TEqpchk_Eqp where eqpchk_main_code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -1351,9 +1353,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 +1363,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);
@@ -1723,6 +1724,9 @@
//鍒犻櫎璁惧淇濆吇鏍囧噯鍏宠仈淇濆吇椤圭洰瀛愯〃
sql = @"delete TEqpmai_Deta where eapmai_code=@repairstand_code";
list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ //鍒犻櫎璁惧淇濆吇鏍囧噯鍏宠仈璁惧琛�
+ sql = @"delete TEqpmai_Eqp where eapmai_code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1789,9 +1793,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 +1803,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);
@@ -2438,7 +2441,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 +2452,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