From 7b31d00b64218b6f11e2fa92386e3d15ee332d3e Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 16 五月 2022 15:51:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..06ff6d5 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 = "";
--
Gitblit v1.9.1