From 1858c852150eedebdb4d03e187834577cc7bfb3b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 18 二月 2025 17:53:13 +0800
Subject: [PATCH] 采购退货申请

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index f16f4ab..4380bf5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -15,6 +15,8 @@
     {
         string _webServiceName = "MesCgthSqManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
+        string _ucCk = "";//鍙戞枡浠撳簱
+        string _ucGys = "";//渚涘簲鍟�
         public Frm_MesCgthSq()
         {
             InitializeComponent();
@@ -27,7 +29,7 @@
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName, gridView1, picCheckBox, this, "status", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -43,13 +45,14 @@
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             txt_depotId.getSuppler("");
             txt_suppId.getSuppler("");
+            //閫夋嫨搴撳瓨缁勭粐锛堜粨搴撳拰渚涘簲鍟嗭級
             txt_thOrgId.EditChanged += (s, e) =>
             {
                 var orgId = txt_thOrgId.GetId();
                 if (string.IsNullOrEmpty(orgId))
                     return;
-                txt_suppId.getSuppler(orgId);
-                txt_depotId.getSuppler(orgId);
+                txt_suppId.getSuppler(orgId, _ucGys);
+                txt_depotId.getSuppler(orgId, _ucCk);
             };
             //閫夋嫨闇�瑕佺殑鏄庣粏
             btnSelect.Click += (s, e) =>
@@ -59,7 +62,7 @@
                     Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紒");
                     return;
                 }
-                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(),this.txt_thOrgId.GetId(), (txt_isOut.Checked == true ? 1 : 0).ToString());
+                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId(), (txt_isOut.Checked == true ? 1 : 0).ToString());
                 //璧嬪�肩粰鏄庣粏琛�
                 frm.UpdateParent += (ss, ee) =>
                 {
@@ -93,7 +96,7 @@
         }
         private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             await Task.Delay(100);
             getPageList(1);
         }
@@ -300,13 +303,13 @@
                 txt_depotId.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(txt_returnMethod.Text.Trim()))
+            if (txt_returnMethod.SelectedIndex <= 0)
             {
                 MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
                 txt_returnMethod.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(txt_returnType.Text.Trim()))
+            if (txt_returnType.SelectedIndex <= 0)
             {
                 MsgHelper.Warning("璇烽�夋嫨閫�鏂欏師鍥狅紒");
                 txt_returnType.Focus();
@@ -363,7 +366,10 @@
                     lbGuid.Text = _rtn.rtnData.outGuid;
                     txt_billNo.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                    gvList.Add(gvMx1);
+                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+                    toolBarMenu1.currentAction = "";
                 }
             }
             catch (Exception ex)
@@ -435,10 +441,14 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
+                    _ucGys = dy.suppId;
+                    _ucCk = dy.depotId;
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+                    _ucGys = "";
+                    _ucCk = "";
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])

--
Gitblit v1.9.3