From 88d941c245a34ea3564d37e187d80aaaf748c5d6 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 03 十一月 2021 17:29:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/MES_WIPProcReport.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs"
index ccb2971..18b3838 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs"
@@ -132,6 +132,7 @@
{
dtpHFDate.Value = DateTime.Today;
dtpHEDate.Value = DateTime.Today;
+ cmbHType.Text = "鍏ㄩ儴";
}
private bool Fun_AllowQuery()//瀹℃牳鏌ヨ鏉′欢
@@ -162,11 +163,11 @@
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
sDlgWhere = sDlgWhere + ",'" + dtpHFDate.Value.ToShortDateString() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHWorkCenter.Text.Trim() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHSupName.Text.Trim() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHExProcNo.Text.Trim() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHOrderProcNo.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + cmbHType.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHProcName.Text.Trim() + "'";
sDlgWhere = sDlgWhere + ",'" + txtHMaterNumber.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaterName.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaterModel.Text.Trim() + "'";
if (sDlgWhere.Trim().Length > 0)
{
@@ -335,15 +336,6 @@
}
}
- private void cmdHWorkCenter_Click(object sender, EventArgs e)
- {
- BLL.ClsBaseSelect.SetTextByWorkCenter(txtHWorkCenter);
- }
-
- private void cmdHSupName_Click(object sender, EventArgs e)
- {
- BLL.ClsBaseSelect.SetTextBySupplier(txtHSupName);
- }
private void grdMain_Scroll(object sender, ScrollEventArgs e)
{
@@ -370,8 +362,16 @@
DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);
}
-
-
+ //娓呯┖鎸夐挳
+ private void btnClear_Click(object sender, EventArgs e)
+ {
+ dtpHFDate.Value = DateTime.Today;
+ cmbHType.Text = "鍏ㄩ儴";
+ txtHProcName.Text = "";
+ txtHMaterNumber.Text = "";
+ txtHMaterName.Text = "";
+ txtHMaterModel.Text = "";
+ }
--
Gitblit v1.9.1