From 63dd8bdd72afc4e8277606932999e598a13dd04e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 08 八月 2025 10:09:59 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/UserControl/UcLookItems.cs |   78 ++++++++++++++++++--------------------
 1 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index f201939..dc44ba6 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -1,16 +1,7 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace Gs.DevApp.UserControl
 {
@@ -22,20 +13,10 @@
             lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
             lookSearchSupplier.EditValueChanged +=
                 LookSearchSupplier_EditValueChanged;
+            // getSuppler("");
 
         }
-
-        private string _KeyFile = "";
-        public string KeyFile
-        {
-            get { return _KeyFile; }
-            set
-            {
-                _KeyFile = value;
-                if (!string.IsNullOrEmpty(_KeyFile))
-                    getSuppler();
-            }
-        }
+        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
         /// <summary>
         ///     鏀瑰彉浜嬩欢
         /// </summary>
@@ -47,28 +28,47 @@
             if (EditChanged != null) EditChanged(this, e);
         }
 
-        private async void getSuppler()
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="orgId">缁勭粐</param>
+        /// <param name="_dftVale">榛樿閫変腑鍊�</param>
+        /// <param name="strWhere">鏌ヨ鏉′欢</param>
+        /// <param name="strType">闄勫姞绫诲瀷锛氬綋涓猴細iqc,ipqc,fqc鏃讹紝鍏嶆锛岀壒鍒姞涓婅繃婊ゆ潯浠�</param>
+        public void getSuppler(string orgId, string _dftVale = "",string strWhere="",string strType="")
         {
-            UcLoading _loading = new UcLoading();
-            var pgq = new PageQueryModel(1, 999999, "item_name", "asc", "",
-                " and fforbidstatus='A'");
-            var json = JsonConvert.SerializeObject(pgq);
+            string _keyWhere = "";
+            if (!string.IsNullOrEmpty(orgId))
+                _keyWhere = " and a.FSubsidiary ='" + orgId + "'";
+            if (!string.IsNullOrEmpty(strWhere))
+                _keyWhere += strWhere;
+            var _obj = new
+            {
+                currentPage = 1,
+                everyPageSize = 999999,
+                sortName = "",
+                keyWhere = _keyWhere,
+                keyType= strType
+            };
+            var json = JsonConvert.SerializeObject(_obj);
             try
             {
-                var strReturn = await UtilityHelper.HttpPostAsync("",
-                    "MesItemsManager/GetListPageByLook", json);
-                var rtn = UtilityHelper.ReturnToList(strReturn);
-                var dt = rtn.rtnData;
+                var strReturn = UtilityHelper.HttpPost("",
+                    "MesItemsManager/GetListSelect", json);
+                var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+                var dt = rtn.rtnData.list;
                 lookSearchSupplier.Properties.DataSource = dt;
                 lookSearchSupplier.Properties.DisplayMember = "itemName";
-                // lookSearchSupplier.Properties.ValueMember = "depotId";
-                lookSearchSupplier.Properties.ValueMember = KeyFile;
+                lookSearchSupplier.Properties.ValueMember = "id";
+                lookSearchSupplier.ForceInitialize();
+                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+                if (!string.IsNullOrEmpty(_dftVale))
+                    SetIdOrCode(_dftVale);
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-            _loading.Close();
         }
 
         public string GetId()
@@ -99,7 +99,8 @@
         public string GetModel()
         {
             var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
-            if (row != null) {
+            if (row != null)
+            {
                 string id = row["itemModel"].ToString();
                 return id;
             }
@@ -113,12 +114,7 @@
                 lookSearchSupplier.EditValue = null;
                 return;
             }
-            if (KeyFile == "id")
-            {
-                lookSearchSupplier.EditValue =((Code.ToString().Trim()));
-            }
-            else
-                lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
+            lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3