From 7cb6753c8a92c562d5258085df0ce5248eb5eefa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 26 三月 2025 21:47:12 +0800
Subject: [PATCH] 退货申请

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |   43 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index b05d9ba..c27c5ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,4 +1,3 @@
-using DevExpress.RichEdit.Export;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -28,6 +27,8 @@
             this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
             this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
             this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
+            this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
+            this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -55,9 +56,10 @@
                 _print();
             };
         }
+
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -81,7 +83,7 @@
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList);
+              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -94,6 +96,27 @@
         {
             _filterList = e.FilterList;
             getPageList(1);
+        }
+        /// <summary>
+        /// 缁撴
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
+        {
+           
+        }
+        /// <summary>
+        /// 鍙嶇粨妗�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+
+        private void ToolBarMenu1_btnJieAnClick1(object sender, EventArgs e)
+        {
+            _toolCk(99);
         }
         private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
         {
@@ -226,6 +249,8 @@
                     gvList.Add(gvMx1);
                     UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
+                    txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
+                    txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
                 }
             }
             catch (Exception ex)
@@ -257,7 +282,7 @@
                     {
                         gcMain1.DataSource = dt;
                         gcMain1.ForceInitialize();
-                        gridView1.BestFitColumns();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -323,6 +348,7 @@
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
                         gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                     }
                     else
                     {
@@ -391,6 +417,9 @@
                 case 9:
                     strMsg = "鎵嬪姩瀹屽伐";
                     break;
+                case 99:
+                    strMsg = "缁撴";
+                    break;
             };
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
@@ -423,8 +452,8 @@
                     }
                     else {
                         //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
-                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                         getPageList(this.pageBar1.CurrentPage);
+                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                         gridView1.FocusedRowHandle = rowHandle;
                     }
                 }
@@ -482,12 +511,12 @@
                 var _obj = new
                 {
                     mxGuid = mxGuid,
-                    inType = "dhtm"
+                    inType = "daa"
                 };
                 try
                 {
                     var strJson = UtilityHelper.HttpPost("",
-                        _webServiceName + "DeleteBarcode",
+                         "VArrivalBarcodeManager/DeleteBarcode",
                         JsonConvert.SerializeObject(_obj));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     if (_rtn.rtnCode > 0)

--
Gitblit v1.9.3