From 34e30e2261a057fc9f46f67a3d216e3d9a9e67be Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 03 六月 2025 17:17:21 +0800
Subject: [PATCH] 上线梳理

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 1b8d435..3cf93b3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -1,5 +1,6 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rk;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -24,6 +25,7 @@
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "docStusTxt", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -182,8 +184,7 @@
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["list"]) array.Add(a);
-                    var dt =
-                        JsonConvert.DeserializeObject<DataTable>(
+                    var dt = JsonConvert.DeserializeObject<DataTable>(
                             array.ToString());
                     if (dt.Rows.Count > 0)
                     {
@@ -196,6 +197,22 @@
                     {
                         UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                     }
+
+                    var array2 = new JArray();
+                    foreach (var a in _job["rtnData"]["list2"]) array2.Add(a);
+                    var dt2 = JsonConvert.DeserializeObject<DataTable>(
+                            array2.ToString());
+                    if (dt2.Rows.Count > 0)
+                    {
+                        gcMx2.BindingContext = new BindingContext();
+                        gcMx2.DataSource = dt2;
+                        gcMx2.ForceInitialize();
+                        gvMx2.BestFitColumns();
+                    }
+                    else
+                    {
+                        UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+                    }
                 }
                 else
                 {
@@ -207,5 +224,21 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        /// <summary>
+        /// 鏌ョ湅鍒拌揣璁板綍锛屾牴鎹噰璐槑缁唃uid
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rptHistory_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            var rowhandle = gvMx1.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            var dr = gvMx1.GetDataRow(rowhandle);
+            var mxGuid = dr["guid"].ToString();
+            HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid);
+            frm.ShowDialog();
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3