From 437f8436bfd174b34a8ec4e48babf25ceb533ef3 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 26 八月 2022 16:05:05 +0800
Subject: [PATCH] MES工单新选源单、选单据类型(标准工单、报废补单) 开发工序检验报表(查询、导出)
---
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index ef8756f..88c19f4 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -614,8 +614,15 @@
mes.data = null;
return mes;
}
+
//鍒犻櫎璁惧
sql = @"update TEqpInfo set is_delete='1' where code=@devicecode";
+ list.Add(new { str = sql, parm = new { devicecode = devicecode } });
+ //鍒犻櫎璁惧鍏宠仈鐐规鏍囧噯琛�
+ sql = @"delete TEqpchk_Eqp where eqp_code=@devicecode";
+ list.Add(new { str = sql, parm = new { devicecode = devicecode } });
+ //鍒犻櫎璁惧缁戝畾淇濆吇鏍囧噯琛�
+ sql = @"delete TEqpmai_Eqp where eqp_code=@devicecode";
list.Add(new { str = sql, parm = new { devicecode = devicecode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1156,7 +1163,7 @@
if (opertype == "Add")
{
//鏂板璁惧鐐规鏍囧噯涓昏〃
- sql = @"insert into TEqpchk_Main(code,name,description,iscontr,lm_user,lm_date) values(@code,@name,@descr,@lm_user,@lm_date)";
+ sql = @"insert into TEqpchk_Main(code,name,description,iscontr,lm_user,lm_date) values(@code,@name,@descr,@iscontr,@lm_user,@lm_date)";
list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description, iscontr = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
for (int i = 0; i < json.Data.Rows.Count; i++)
{
@@ -1313,7 +1320,7 @@
{
string sql = "";
var dynamicParams = new DynamicParameters();
- List<StepEqp> list = new List<StepEqp>();
+ List<StandEqp> list = new List<StandEqp>();
try
{
//鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
@@ -1328,26 +1335,41 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
{
- StepEqp rout = new StepEqp();
+ StandEqp rout = new StandEqp();
rout.code = data.Rows[i]["WKSP_CODE"].ToString();
rout.name = data.Rows[i]["WKSP_NAME"].ToString();
rout.type = data.Rows[i]["TYPE"].ToString();
rout.flag = data.Rows[i]["FLAG"].ToString();
- rout.children = new List<StepEqpCn>();
+ rout.children = new List<StandEqpCn>();
//鏍规嵁杞﹂棿缂栫爜鏌ユ壘璁惧(鍖呭惈宸插叧鑱旀爣璇�)
- sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
+ //sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
+ // from TEqpInfo A
+ // left join(
+ // select distinct A.eqp_code from TEqpchk_Eqp A
+ // inner join TEqpInfo B on A.eqp_code=B.code
+ // where A.eqpchkmain_code=@checkstand_code and A.is_delete<>'1' and B.is_delete<>'1'
+ // ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
+ sql = @"select * from(
+ select AA.code,AA.name,(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
from TEqpInfo A
- left join(
- select distinct A.eqp_code from TEqpchk_Eqp A
- inner join TEqpInfo B on A.eqp_code=B.code
- where A.eqpchkmain_code=@checkstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
+ 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 (
+ select A.code,A.name,B.eqpchkmain_code
+ from TEqpInfo A
+ 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";
dynamicParams.Add("@checkstand_code", checkstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < data0.Rows.Count; j++)
{
- StepEqpCn cn = new StepEqpCn();
+ StandEqpCn cn = new StandEqpCn();
cn.code = data0.Rows[j]["CODE"].ToString();//璁惧缂栫爜
cn.name = data0.Rows[j]["NAME"].ToString();//璁惧鍚嶇О
cn.type = data0.Rows[j]["TYPE"].ToString();//宸ヤ綔绔欑被鍨�(E:璁惧 W:澶栧崗渚涙柟)
@@ -1734,7 +1756,7 @@
{
string sql = "";
var dynamicParams = new DynamicParameters();
- List<StepEqp> list = new List<StepEqp>();
+ List<StandEqp> list = new List<StandEqp>();
try
{
//鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
@@ -1745,30 +1767,46 @@
inner join TEqpInfo B on A.eqp_code=B.code
where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'";
+
dynamicParams.Add("@repairstand_code", repairstand_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
{
- StepEqp rout = new StepEqp();
+ StandEqp rout = new StandEqp();
rout.code = data.Rows[i]["WKSP_CODE"].ToString();
rout.name = data.Rows[i]["WKSP_NAME"].ToString();
rout.type = data.Rows[i]["TYPE"].ToString();
rout.flag = data.Rows[i]["FLAG"].ToString();
- rout.children = new List<StepEqpCn>();
+ rout.children = new List<StandEqpCn>();
//鏍规嵁杞﹂棿缂栫爜鏌ユ壘璁惧(鍖呭惈宸插叧鑱旀爣璇�)
- sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
+ //sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
+ // from TEqpInfo A
+ // left join(
+ // select distinct A.eqp_code from TEqpmai_Eqp A
+ // inner join TEqpInfo B on A.eqp_code=B.code
+ // where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
+ // ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
+ sql = @"select * from(
+ select AA.code,AA.name,(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
from TEqpInfo A
- left join(
- select distinct A.eqp_code from TEqpmai_Eqp A
- inner join TEqpInfo B on A.eqp_code=B.code
- where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
+ 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 (
+ select A.code,A.name,B.eapmai_code
+ from TEqpInfo A
+ 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";
dynamicParams.Add("@repairstand_code", repairstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < data0.Rows.Count; j++)
{
- StepEqpCn cn = new StepEqpCn();
+ StandEqpCn cn = new StandEqpCn();
cn.code = data0.Rows[j]["CODE"].ToString();//璁惧缂栫爜
cn.name = data0.Rows[j]["NAME"].ToString();//璁惧鍚嶇О
cn.type = data0.Rows[j]["TYPE"].ToString();//宸ヤ綔绔欑被鍨�(E:璁惧 W:澶栧崗渚涙柟)
--
Gitblit v1.9.3