From 8fdbaa96f141543fe9f6210975734809a209a0c8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 07 六月 2024 15:03:16 +0800
Subject: [PATCH] 1.报工增加按序和不按序报工操作，工序调整增加按序和不按序报工调整 2.增加SOP管理：设备SOP管理、工艺SOP管理功能
---
VueWebCoreApi/DLL/DAL/AppAnalyticsDAL.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/AppAnalyticsDAL.cs b/VueWebCoreApi/DLL/DAL/AppAnalyticsDAL.cs
index 336c300..9c91f76 100644
--- a/VueWebCoreApi/DLL/DAL/AppAnalyticsDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/AppAnalyticsDAL.cs
@@ -122,7 +122,7 @@
//鑾峰彇鍗曟嵁淇℃伅
sql = @"select distinct saleOrderCode,A.saleOrderDate,sum(A.saleOrderqty) as saleOrderqty
from TKimp_Ewo A
- where A.saleOrderCode<>'' " + search + " group by A.saleOrderCode,A.saleOrderDate order by A.saleOrderDate desc";
+ where A.saleOrderCode<>'' and A.status<>'CLOSED' " + search + " group by A.saleOrderCode,A.saleOrderDate order by A.saleOrderDate desc";
dt = DapperHelper.selectlist(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
@@ -137,7 +137,7 @@
select distinct E.wo,T.partcode,T.partname,T.partspec,sum(E.saleOrderqty) as saleOrderqty
from TKimp_Ewo E
left join TMateriel_Info T on E.materiel_code=T.partcode
- where E.saleOrderCode=@saleOrderCode
+ where E.saleOrderCode=@saleOrderCode and E.status<>'CLOSED'
group by E.wo,T.partcode,T.partname,T.partspec
) as AA
left join
@@ -212,7 +212,7 @@
where S.isend='Y' and S.good_qty>0
group by M.m_po
) as BB on E.wo=BB.m_po
- where E.wo=@wo
+ where E.wo=@wo and E.status<>'CLOSED'
group by E.wo,T.partcode,T.partname,T.partspec,BB.good_qty";
dynamicParams.Add("@wo", dt.Rows[i]["wo"].ToString());
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -260,7 +260,7 @@
sql = @"select distinct A.wo_code,T.partcode,T.partname,T.partspec,A.lm_date,sum(A.plan_qty) as orderqty
from TK_Wrk_Man A
left join TMateriel_Info T on A.materiel_code=T.partcode
- where 1=1 " + search + search1 + " group by A.wo_code,T.partcode,T.partname,T.partspec,A.lm_date order by A.lm_date desc";
+ where A.status<>'CLOSED' " + search + search1 + " group by A.wo_code,T.partcode,T.partname,T.partspec,A.lm_date order by A.lm_date desc";
dt = DapperHelper.selectlist(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
--
Gitblit v1.9.3