From dfd02ad42c5b4f8ee7190fe51730c21cf75d37a5 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期一, 24 十一月 2025 15:36:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
index 4ffa9c7..09df397 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
@@ -1,4 +1,5 @@
-锘縰sing DevExpress.Utils;
+锘縰sing DevExpress.Pdf.Native.BouncyCastle.Asn1.X509;
+using DevExpress.Utils;
 using DevExpress.XtraGrid.Views.Grid.ViewInfo;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
@@ -163,7 +164,7 @@
                         beginDate = dateEdit1.EditValue.ToString(),
                         endDate = dateEdit2.EditValue.ToString()
                     };
-                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_shjh","","","", _params);
+                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_shjh", "", "", "", _params);
                     try
                     {
                         string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
@@ -191,5 +192,24 @@
                 }
             }
         }
+
+        private void btnBOMQuery_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetErpBOM", "");
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation("BOM鏁版嵁鏇存柊鎴愬姛");
+                }
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3