From a9ff79ecf6279fb863d7962643de54beaa4b5cc3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 六月 2025 08:07:29 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs |   68 +++++++++++++++------------------
 1 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index d4ae8aa..b81bd11 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -1,6 +1,7 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rk;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -30,8 +31,8 @@
             toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
             toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
-            toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -55,12 +56,6 @@
                 if (string.IsNullOrEmpty(_orgId))
                     return;
                 txt_suppId.getSuppler(_orgId, _ucGys);
-                txt_depotsId.getSuppler(_orgId, _ucCk);
-            };
-            //璁剧疆浠撳簱閫夋嫨
-            this.txt_depotsId.EditChanged += (s, e) =>
-            {
-                txtDepotsCode.Text = this.txt_depotsId.GetCode();
             };
             //璁剧疆渚涘簲鍟嗛�夋嫨
             this.txt_suppId.EditChanged += (s, e) =>
@@ -113,6 +108,8 @@
                 frm.ShowDialog();
             };
         }
+
+
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
@@ -170,24 +167,13 @@
             toolBarMenu1.guidKey = rowGuid;
         }
 
-        /// <summary>
-        ///  鍙嶆楠�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
-        {
-            _toolCk("EditModelSubmitF");
-        }
-
-        /// <summary>
-        /// 妫�楠�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
         {
             _toolCk("EditModelSubmit");
+        }
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk("EditModelSubmitF");
         }
         /// <summary>
         ///     鍙栨秷浜嬩欢
@@ -317,7 +303,6 @@
         {
             toolBarMenu1.isSetBtn = false;
             string _orgId = txt_receiveOrgId.GetId();
-            string _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
             string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
             if (string.IsNullOrEmpty(_orgId))
             {
@@ -331,19 +316,12 @@
                 txt_suppId.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(_ckId))
-            {
-                MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
-                txt_depotsId.Focus();
-                return;
-            }
             var _obj = new
             {
                 Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
                 PaperBillNo = txt_paperBillNo.Text.Trim(), //閫佽揣鍗曞彿;
                 Remark = txt_remark.Text.Trim(), //澶囨敞
                 SuppId = _gysId, //渚涘簲鍟�
-                DepotsId = _ckId,//浠撳簱
                 OrgId = _orgId,
                 list = new List<dynamic>(),
             };
@@ -409,7 +387,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
                 "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
@@ -576,7 +554,6 @@
                 }
                 var lst = new List<string>();
                 lst.Add(mxGuid);
-
                 var _obj = lst;
                 try
                 {
@@ -586,13 +563,14 @@
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     if (_rtn.rtnCode > 0)
                     {
-
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                     }
-                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             }
         }
@@ -640,5 +618,21 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        /// <summary>
+        /// 鏌ョ湅鍒拌揣璁板綍锛屾牴鎹噰璐槑缁唃uid
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rptHistory_ButtonClick(object sender, ButtonPressedEventArgs e)
+        {
+            var rowhandle = gvMx1.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            var dr = gvMx1.GetDataRow(rowhandle);
+            var mxGuid = dr["aboutGuid"].ToString();
+            HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid);
+            frm.ShowDialog();
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3