From d38136e8b743a3186dc873d0f18e5a58e84e86d9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 十一月 2022 08:51:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 673d207..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"
@@ -155,9 +155,13 @@
{
sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
}
- if (dtpHBDate.Value.ToShortDateString() != "")//鏃ユ湡
+ if (dtpHBDate.Value.ToShortDateString() != "")//寮�濮嬫棩鏈�
{
- sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHBDate.Value.ToShortDateString() + "'";
+ sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";
+ }
+ if (dtpHEDate.Value.ToShortDateString() != "")//缁撴潫鏃ユ湡
+ {
+ sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";
}
//杩囨护鏉′欢
//string sWhere = "";
@@ -172,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.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
+ ", 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 " +
@@ -185,22 +191,43 @@
") c on a.HProcExchInterID = c.HProcExchInterID and a.HProcID = c.HProcID " +
"left join( " +
"select sum(aa.HQty) HQty, sum(aa.HWasterQty) HWasterQty, bad.HBadQty, bad.HName" +
- ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
+ ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID,bad.HBillSubType " +
"from Sc_StationOutBillMain aa " +
"left join ( " +
- "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
+ "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID,qa.HBillSubType " +
"from QC_NoPassProdCheckBillMain qa " +
"left join QC_NoPassProdCheckBillsub qb on qa.HInterID = qb.HInterID " +
"left join Gy_BadReason qbr on qb.HBadReasonID = qbr.HItemID " +
- "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty " +
+ "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty,qa.HBillSubType " +
") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
- "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
+ "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName,bad.HBillSubType " +
") co on a.HProcExchInterID = co.HProcExchInterID and a.HProcID = co.HProcID " +
"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" +
- ",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty " +
+ ",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);
+
+
+
+
+
+ ////杩囨护鏉′欢Dlg
+ //string sDlgWhere = "";
+ //sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
+ //sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
+ //sDlgWhere = sDlgWhere + ",'" + textHmaterName.Text + "'";
+ //sDlgWhere = sDlgWhere + ",'" + textHprocName.Text + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ //if (sDlgWhere.Trim().Length > 0)
+ //{
+ // sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
+ //}
+
+ //DSet = SubCn.RunProcReturn("exec h_p_DefectiveDetailedYieldReport_New " + sDlgWhere, "h_p_DefectiveDetailedYieldReport_New");
+
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
--
Gitblit v1.9.1