From 33583f8a9716e4313163fb9bbde58fea02012a28 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 08 九月 2025 14:28:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/UserControl/SelectCk.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index ca8220d..31d40d4 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -10,11 +10,19 @@
 {
     public partial class SelectCk : DevExpress.XtraEditors.XtraForm
     {
+        /// <summary>
+        /// 缁勭粐id
+        /// </summary>
         string _strGuid = "";
+        /// <summary>
+        /// 鐗╂枡id锛屼负浜嗘煡璇㈠簱瀛�
+        /// </summary>
+        string _itemId = "";
         private List<FilterEntity> _filterList = new List<FilterEntity>();
-        public SelectCk(string strGuid)
+        public SelectCk(string strGuid, string itemId="")
         {
             _strGuid = strGuid;
+            _itemId = itemId;
             InitializeComponent();
             getPageList(1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
@@ -45,9 +53,9 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             _sbSqlWhere += (" and org.fid='" + _strGuid + "'");
-            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
+            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString(),this._itemId);
             var json = JsonConvert.SerializeObject(pgq);
             try
             {

--
Gitblit v1.9.3