From 02ba47f5a081fcfe6d7ea3a829769db5bf8b2c2b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 七月 2023 13:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/报表分析/Kf_BarCodeOutInReport.cs | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
index e2effff..f7a318f 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
@@ -35,6 +35,8 @@
dtpHEDate.Value = DateTime.Today;
//鍔犺浇鍗曟嵁绫诲瀷淇℃伅
Sub_AddBillTypeList();
+ //鍔犺浇缁勭粐淇℃伅
+ Sub_AddOrdList();
}
//鍔犺浇鍗曟嵁绫诲瀷淇℃伅
@@ -54,6 +56,25 @@
cmbBillType.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBillTypeName"]));
}
cmbBillType.Text = "鍏ㄩ儴";
+ }
+ //鍔犺浇缁勭粐淇℃伅
+ private void Sub_AddOrdList()
+ {
+ DataSet ds;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ ds = oClsGy_ORGANIZATIONS_View.GetList();
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇缁勭粐澶辫触");
+ return;
+ }
+ cmbHOrgID.Items.Clear();
+ cmbHOrgID.Items.Add("鍏ㄩ儴");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ cmbHOrgID.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HName"]));
+ }
+ cmbHOrgID.Text = "鍏ㄩ儴";
}
//璁剧疆鎶ヨ〃鍚嶇О
@@ -184,6 +205,7 @@
sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHSourceBillNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHMaker.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + cmbHOrgID.Text + "'";
if (sDlgWhere.Trim().Length > 0)
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
--
Gitblit v1.9.1