From 27d7b50f43c85f12507ab1a61290fa9551d4d780 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 17 五月 2022 16:58:35 +0800
Subject: [PATCH] 不良评审单、工序进站单、工序出站单、委外接收单、委外发出单删除时增加制单人与删除人是否一致系统参数控制；不良明细良率报表修改优化，原报表取值数据代码里写死改为取存储过程里数据显示
---
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 148 ++++++++++++++++++++++++++++---------------------
1 files changed, 84 insertions(+), 64 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 06ff6d5..6232ec9 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"
@@ -137,74 +137,94 @@
{
SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
DataSet DSet = new DataSet();
+ ////杩囨护鏉′欢Dlg
+ //string sDlgWhere = "";
+ //if (txtHProcessExchangeBillNo.Text != "")//娴佽浆鍗�
+ //{
+ // sDlgWhere = sDlgWhere + "and c.HProcExchBillNo like '%" + txtHProcessExchangeBillNo.Text + "%'";
+ //}
+ //if (txtHICMOBillNo.Text != "")//鐢熶骇璁㈠崟
+ //{
+ // sDlgWhere = sDlgWhere + "and a.HICMOBillNo like '%" + txtHICMOBillNo.Text + "%'";
+ //}
+ //if (textHmaterName.Text != "")//鐗╂枡
+ //{
+ // sDlgWhere = sDlgWhere + "and b.HName like '%" + textHmaterName.Text + "%'";
+ //}
+ //if (textHprocName.Text != "")//宸ュ簭
+ //{
+ // sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
+ //}
+ //if (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 = "";
+ ////sWhere = sWhere + ",'" + this.dtpHBDate.Value.ToShortDateString() + "'";
+ ////sWhere = sWhere + ",'" + this.dtpHEDate.Value.ToShortDateString() + "'";
+ ////sWhere = sWhere + ",1,3";
+ //////sWhere = sWhere + ",'" + frmQuery.dtpHBakEndDate.Value.ToShortDateString() + "'";
+ //////sWhere = sWhere + "," + frmQuery.txtHCusID.Tag.ToString().Trim();
+ ////if (sWhere.Trim().Length > 0)
+ ////{
+ //// sWhere = sWhere.Substring(1, sWhere.Length - 1);
+ ////}
+ ////
+ //DSet = SubCn.RunProcReturn("select " +
+ // "MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿, 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) 鍑虹珯鑹巼,a.hb, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
+ // " FROM Sc_StationOutBillMain a " +
+ // "left join Gy_Material b on a.HMaterID = b.HItemID " +
+ // "left join( " +
+ // "select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
+ // "from Sc_StationInBillMain aa " +
+ // "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
+ // ") 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 " +
+ // "from Sc_StationOutBillMain aa " +
+ // "left join ( " +
+ // "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
+ // "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 " +
+ // ") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
+ // "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
+ // ") 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 " +
+ // "order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);
+
+
+
+
+
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
- if (txtHProcessExchangeBillNo.Text != "")//娴佽浆鍗�
+ 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 + "and c.HProcExchBillNo like '%" + txtHProcessExchangeBillNo.Text + "%'";
+ sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
}
- if (txtHICMOBillNo.Text != "")//鐢熶骇璁㈠崟
- {
- sDlgWhere = sDlgWhere + "and a.HICMOBillNo like '%" + txtHICMOBillNo.Text + "%'";
- }
- if (textHmaterName.Text != "")//鐗╂枡
- {
- sDlgWhere = sDlgWhere + "and b.HName like '%" + textHmaterName.Text + "%'";
- }
- if (textHprocName.Text != "")//宸ュ簭
- {
- sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
- }
- if (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 = "";
- //sWhere = sWhere + ",'" + this.dtpHBDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + ",'" + this.dtpHEDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + ",1,3";
- ////sWhere = sWhere + ",'" + frmQuery.dtpHBakEndDate.Value.ToShortDateString() + "'";
- ////sWhere = sWhere + "," + frmQuery.txtHCusID.Tag.ToString().Trim();
- //if (sWhere.Trim().Length > 0)
- //{
- // sWhere = sWhere.Substring(1, sWhere.Length - 1);
- //}
- //
- DSet = SubCn.RunProcReturn("select " +
- "MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿, 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 涓嶈壇鏁伴噺 " +
- " FROM Sc_StationOutBillMain a " +
- "left join Gy_Material b on a.HMaterID = b.HItemID " +
- "left join( " +
- "select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
- "from Sc_StationInBillMain aa " +
- "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
- ") 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 " +
- "from Sc_StationOutBillMain aa " +
- "left join ( " +
- "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
- "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 " +
- ") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
- "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
- ") 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 " +
- "order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);
+
+ DSet = SubCn.RunProcReturn("exec h_p_DefectiveDetailedYieldReport_New " + sDlgWhere, "h_p_DefectiveDetailedYieldReport_New");
+
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
--
Gitblit v1.9.1