~yxj/MES-WEB-API.git

			@@ -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 = "";
			}