From 11d20b4fb7a3e97c88477f78f1f5393238e2f3a3 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期三, 20 一月 2021 13:53:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes
---
SCM/单据资料/Gy_BarCodeMain.cs | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs"
index 955413d..9d397c0 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs"
@@ -16,7 +16,6 @@
InitializeComponent();
dateTimePicker1.Text = DateTime.Now.AddDays(-7).ToString();
dateTimePicker2.Text = DateTime.Now.ToString();
- comboBox1.SelectedItem = "鍏ㄩ儴";
oWeb.Url = SCM.ClsPub1.WEBSURL;
}
public frmBillQueryCondition_Base frmCondition;
@@ -50,10 +49,6 @@
whereBuilder.Append(" and e.FNUMBER like ''%"+textBox1.Text+"%''");
if (!string.IsNullOrEmpty(textBox2.Text))
whereBuilder.Append(" and c.HMaterName like ''%"+textBox2.Text+"%''");
- if (comboBox1.Text == "宸叉楠�")
- whereBuilder.Append(" and c.HMaterName is not null");
- else if(comboBox1.Text=="鏈楠�")
- whereBuilder.Append(" and c.HMaterName is null");
var execSql = "exec "+ViewName+" '"+whereBuilder+"'";
DataSet DSet = oWeb.getDataSetBySQL(execSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
--
Gitblit v1.9.1