From c6dd03e8801ae3e375f49312113db01a37ffbc5f Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期二, 24 五月 2022 11:41:09 +0800
Subject: [PATCH] 不良报表增加任务单类型字段
---
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
index c5cbcd2..1940c13 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
@@ -176,11 +176,13 @@
//}
//
DSet = SubCn.RunProcReturn("select " +
- "MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿, c.HProcExchBillNo 娴佽浆鍗″彿, c.HProcID, d.HName 宸ュ簭鍚嶇О" +
+ "MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿," +
+ "case when isnull(ic.HBillSubType,0)='1055' then '杩斿伐' else '鏅�氳鍗�' end 浠诲姟鍗曠被鍨� , c.HProcExchBillNo 娴佽浆鍗″彿, c.HProcID, d.HName 宸ュ簭鍚嶇О" +
", sum(a.HWorkTimes) 宸ユ椂, b.HName 鐗╂枡鍚嶇О, a.HICMOQty 鐢熶骇璁㈠崟鏁伴噺, a.HPlanQty 璁″垝鏁伴噺, c.HQty 杩涚珯鏁伴噺" +
", co.HQty 鍑虹珯鍚堟牸鏁伴噺, c.HQty - co.HQty - co.HWasterQty 鏈繘绔欐暟閲�" +
", co.HWasterQty 涓嶅悎鏍兼暟閲�, co.HQty / nullif((co.HQty+co.HWasterQty),0) 鍑虹珯鑹巼,co.HBillSubType 涓氬姟绫诲瀷, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
" FROM Sc_StationOutBillMain a " +
+ "left join sc_icmobillmain ic on a.HICMOInterID =ic.HInterID " +
"left join Gy_Material b on a.HMaterID = b.HItemID " +
"left join( " +
"select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
@@ -203,6 +205,7 @@
"left join Gy_Process d on c.HProcID = d.HItemID " +
"where 1 = 1 " + sDlgWhere +
"group by a.HICMOBillNo,c.HProcExchBillNo,d.HName,b.HName,a.HICMOQty,c.HQty,a.HPlanQty" +
+ ",case when isnull(ic.HBillSubType,0)='1055' then '杩斿伐' else '鏅�氳鍗�' end " +
",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty,co.HBillSubType " +
"order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1