From 2691afba0b2d101b5ac12ffe8b419e4a82a9c9b4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 26 六月 2025 17:29:29 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs |  107 +++++++++++++++++++++++++++--------------------------
 1 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 633c470..53b7e42 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -84,21 +84,53 @@
                     {
                         var lst = new List<string>();
                         lst = ee.StringList;
-                        var _obj = lst;
-                        var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectFormTo", 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++)
+                        string strReturn = "";
+                        ReturnModel<DataTable> dt;
+                        #region 杩欐槸Srm鏉ョ殑鍗曞瓙
+                        if (lst == null)
                         {
-                            _oldTable.ImportRow(sourceRows[i]);
+                            string strSrmNo = "";
+                            List<dynamic> lstSrm = new List<dynamic>();
+                            lstSrm = ee.DynamicList;
+                            strSrmNo = lstSrm[0].guid;
+                            txt_paperBillNo.Text = strSrmNo;
+                            var _obj = new
+                            {
+                                inShdh = strSrmNo,
+                                inP1 = "",
+                                inP2 = ""
+                            };
+                            strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectSrmTo", JsonConvert.SerializeObject(_obj));
+                            dt = UtilityHelper.ReturnToList(strReturn);
+                            DataTable _newTable = dt.rtnData;
+                            gcMx1.BindingContext = new BindingContext();
+                            gcMx1.DataSource = _newTable;
+                            gcMx1.ForceInitialize();
+                            gvMx1.PostEditor();
+                            gvMx1.UpdateCurrentRow();
                         }
-                        gcMx1.BindingContext = new BindingContext();
-                        gcMx1.DataSource = _oldTable;
-                        gcMx1.ForceInitialize();
-                        gvMx1.PostEditor();
-                        gvMx1.UpdateCurrentRow();
+                        #endregion
+                        #region 杩欐槸鏅�氱殑鍗�
+                        else
+                        {
+                            txt_paperBillNo.Text = "";
+                            var _obj = lst;
+                            strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectFormTo", JsonConvert.SerializeObject(_obj));
+                            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();
+                        }
+                        #endregion
                     }
                     catch (Exception ex)
                     {
@@ -107,42 +139,7 @@
                 };
                 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();
-            };
+
         }
 
 
@@ -327,6 +324,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>
@@ -341,13 +340,13 @@
             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;
             }
@@ -397,9 +396,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;
@@ -409,10 +408,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);
             }
         }
 

--
Gitblit v1.9.3