From ccbe3fad6c7ebb9c1e936163c7f04cb469ff32fc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 六月 2025 17:08:59 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs |   99 +++++++++++++++++++++++++++++--------------------
 1 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index ed2f9fd..7e9005c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -31,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);
@@ -56,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,7 +107,44 @@
                 };
                 frm.ShowDialog();
             };
+            //閫夋嫨srm鏄庣粏
+            txt_paperBillNo.ButtonClick += (s, e) =>
+            {
+                string strSrmNo = "";
+                SelectSrm frm = new SelectSrm();
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    var lst = new List<dynamic>();
+                    lst = ee.DynamicList;
+                    strSrmNo = lst[0].guid;
+                    txt_paperBillNo.Text = strSrmNo;
+                    txt_receiveOrgId.SetIdOrCode(lst[0].receiveOrgId);
+                    txt_suppId.SetIdOrCode(lst[0].suppId);
+                    var _obj = new
+                    {
+                        inShdh = strSrmNo,
+                        inP1 = "",
+                        inP2 = ""
+                    };
+                    var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectSrmTo", JsonConvert.SerializeObject(_obj));
+                    var dt = UtilityHelper.ReturnToList(strReturn);
+                    DataTable _newTable = dt.rtnData;
+                    DataTable _oldTable = (DataTable)gcMx1.DataSource;
+                    DataRow[] sourceRows = _newTable.Select();
+                    for (int i = 0; i < sourceRows.Length; i++)
+                    {
+                        _oldTable.ImportRow(sourceRows[i]);
+                    }
+                    gcMx1.BindingContext = new BindingContext();
+                    gcMx1.DataSource = _oldTable;
+                    gcMx1.ForceInitialize();
+                    gvMx1.PostEditor();
+                    gvMx1.UpdateCurrentRow();
+                };
+                frm.ShowDialog();
+            };
         }
+
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
@@ -171,24 +202,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>
         ///     鍙栨秷浜嬩欢
@@ -307,6 +327,8 @@
             gridViews.Add(gvMx1);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            //澧炲姞鏃讹紝榛樿缁勭粐
+            string deftOrg = UtilityHelper.GetFirstOrg(txt_receiveOrgId);
         }
 
         /// <summary>
@@ -318,24 +340,17 @@
         {
             toolBarMenu1.isSetBtn = false;
             string _orgId = txt_receiveOrgId.GetId();
-            string _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
             string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
             if (string.IsNullOrEmpty(_orgId))
             {
-                MsgHelper.Warning("璇烽�夋嫨鏀舵枡缁勭粐锛�");
+                MsgHelper.ShowError("璇烽�夋嫨鏀舵枡缁勭粐锛�");
                 txt_receiveOrgId.Focus();
                 return;
             }
             if (string.IsNullOrEmpty(_gysId))
             {
-                MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
+                MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
                 txt_suppId.Focus();
-                return;
-            }
-            if (string.IsNullOrEmpty(_ckId))
-            {
-                MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
-                txt_depotsId.Focus();
                 return;
             }
             var _obj = new
@@ -344,7 +359,6 @@
                 PaperBillNo = txt_paperBillNo.Text.Trim(), //閫佽揣鍗曞彿;
                 Remark = txt_remark.Text.Trim(), //澶囨敞
                 SuppId = _gysId, //渚涘簲鍟�
-                DepotsId = _ckId,//浠撳簱
                 OrgId = _orgId,
                 list = new List<dynamic>(),
             };
@@ -385,9 +399,9 @@
                     _webServiceName + "EditModel",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 if (_rtn.rtnCode > 0)
                 {
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                     lbGuid.Text = _rtn.rtnData.outGuid;
                     txt_billNo.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
@@ -397,10 +411,12 @@
                     toolBarMenu1.currentAction = "";
                     Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -410,7 +426,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);
@@ -577,7 +593,6 @@
                 }
                 var lst = new List<string>();
                 lst.Add(mxGuid);
-
                 var _obj = lst;
                 try
                 {
@@ -587,13 +602,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);
                 }
             }
         }
@@ -657,5 +673,6 @@
             HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid);
             frm.ShowDialog();
         }
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3