From 0fce93ca1940f835ce3f63077acdae94988c6fef Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 03 九月 2025 17:49:05 +0800
Subject: [PATCH] 1、合并打印更新
---
DevApp/Gs.DevApp/UserControl/UcLookKw.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookKw.cs b/DevApp/Gs.DevApp/UserControl/UcLookKw.cs
index afaf9ce..0542bcf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookKw.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookKw.cs
@@ -35,12 +35,12 @@
/// </summary>
/// <param name="orgId"></param>
/// <param name="_dftVale"></param>
- public void getSuppler(string orgId, string _dftVale = "")
+ public void getSuppler(string orgId,string depotId, string _dftVale = "")
{
lookSearchSupplier.EditValue = null;
string _keyWhere = "";
- if (!string.IsNullOrEmpty(orgId))
- _keyWhere = " and a.FSubsidiary ='" + orgId + "'";
+ if (!string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(depotId))
+ _keyWhere = " and a.FSubsidiary ='" + orgId + "' and b.depot_guid ='" + depotId + "'";
var pgq = new PageQueryModel(1, 999999, "b.xh", "asc", "",
" and is_ng='A'" + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
@@ -49,10 +49,10 @@
var strReturn = UtilityHelper.HttpPost("",
"MesDepotSectionsManager/GetListPage", json);
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
+ var dt = rtn.rtnData.list;
lookSearchSupplier.Properties.DataSource = dt;
- lookSearchSupplier.Properties.DisplayMember = "DepotSectionCode";
- lookSearchSupplier.Properties.ValueMember = "Guid";
+ lookSearchSupplier.Properties.DisplayMember = "depotSectionCode";
+ lookSearchSupplier.Properties.ValueMember = "guid";
lookSearchSupplier.ForceInitialize();
lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
if (!string.IsNullOrEmpty(_dftVale))
@@ -69,7 +69,7 @@
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
if (row != null)
{
- string id = row["DepotId"].ToString();
+ string id = row["Guid"].ToString();
return id;
}
return "";
@@ -79,7 +79,7 @@
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
if (row != null)
{
- string id = row["DepotCode"].ToString();
+ string id = row["DepotSectionCode"].ToString();
return id;
}
return "";
@@ -98,7 +98,7 @@
return;
}
if (!string.IsNullOrEmpty(Code))
- lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
}
/// <summary>
--
Gitblit v1.9.3