From c8b1ba855be2663a1da3444c54d8af5a202a4b7e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 三月 2023 16:33:32 +0800
Subject: [PATCH] 1.节拍工价新增、编辑加工价类型字段区分自制、外协 2.工序编辑，工序类型切换保存时删除对应节拍工价表 3.工单派发时判断区分自制、外协工序 4.计件工资报表增加剔除工序参数
---
VueWebApi/DLL/DAL/AppAnalyticsDAL.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppAnalyticsDAL.cs b/VueWebApi/DLL/DAL/AppAnalyticsDAL.cs
index 8adf1e8..9dc1b4c 100644
--- a/VueWebApi/DLL/DAL/AppAnalyticsDAL.cs
+++ b/VueWebApi/DLL/DAL/AppAnalyticsDAL.cs
@@ -64,9 +64,9 @@
case "prt": //鎸変骇鍝佺粺璁�
sql2 = @"select top 5 sum(AA.plan_qty) as plan_qty,AA.partname,sum(AA.ng_qty)+sum(AA.bad_qty) as defect_qty from (
select A.plan_qty,M.partname,S.ng_qty,S.bad_qty from TK_Wrk_Man A
- inner join (select wo_code, isnull(sum(ng_qty),0) as ng_qty,isnull(sum(bad_qty),0) as bad_qty from TK_Wrk_Step group by wo_code) S on A.wo_code=S.wo_code
+ inner join (select wo_code, isnull(sum(ng_qty),0) as ng_qty,isnull(sum(bad_qty),0) as bad_qty from TK_Wrk_Step where ng_qty>0 or bad_qty>0 group by wo_code) S on A.wo_code=S.wo_code
inner join TMateriel_Info M on A.materiel_code=M.partcode
- where A.lm_date between @startopendate and @endclosedate and S.ng_qty>0 or S.bad_qty>0
+ where A.lm_date between @startopendate and @endclosedate
) as AA
group by AA.partname
order by defect_qty desc";
@@ -74,9 +74,9 @@
case "stp"://鎸夊伐搴忕粺璁�
sql2 = @"select top 5 sum(AA.plan_qty) as plan_qty,AA.stepname,sum(AA.ng_qty)+sum(AA.bad_qty) as defect_qty from (
select A.plan_qty,T.stepname,S.ng_qty,S.bad_qty from TK_Wrk_Man A
- inner join (select wo_code,step_code, isnull(sum(ng_qty),0) as ng_qty,isnull(sum(bad_qty),0) as bad_qty from TK_Wrk_Step group by wo_code,step_code) S on A.wo_code=S.wo_code
+ inner join (select wo_code,step_code, isnull(sum(ng_qty),0) as ng_qty,isnull(sum(bad_qty),0) as bad_qty from TK_Wrk_Step where ng_qty>0 or bad_qty>0 group by wo_code,step_code) S on A.wo_code=S.wo_code
inner join TStep T on S.step_code=T.stepcode
- where A.lm_date between @startopendate and @endclosedate and S.ng_qty>0 or S.bad_qty>0
+ where A.lm_date between @startopendate and @endclosedate
) as AA
group by AA.stepname
order by defect_qty desc";
--
Gitblit v1.9.3