From 9f9f3248b65a78d3d15dbbf0f57dd93e01f64396 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 26 五月 2025 17:33:58 +0800
Subject: [PATCH] 工单

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |   61 +++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 67ae4c0..48f91fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -27,7 +27,7 @@
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick;
             this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
-           // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
+            // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
             this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
@@ -61,7 +61,7 @@
             };
             txt_psnQty_1.TextChanged += (s, e) =>
             {
-                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut,txt_yuliang_1);
+                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
             };
             radOut.SelectedIndexChanged += (s, e) =>
             {
@@ -84,6 +84,35 @@
             this.ucBtnPrint100.btnReportClick += (s, e) =>
             {
                 _print100();
+            };
+            //瀵煎叆妯℃澘
+            this.btnIn.Click += (s, e) =>
+            {
+                //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔$鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
+                string upGuid = Guid.NewGuid().ToString();
+                string strService = "XlsInDaaHgm";
+                Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    var _obj = new
+                    {
+                        tmpGuid = upGuid,
+                        strType = "",
+                    };
+                    try
+                    {
+                        string strJson = UtilityHelper.HttpPost("",
+                              "XlsInOut/" + strService,
+                              JsonConvert.SerializeObject(_obj));
+                        var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                    }
+                    catch (Exception ex)
+                    {
+                        MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    }
+                };
+                frm.ShowDialog();
             };
         }
 
@@ -222,7 +251,7 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-      
+
         private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
         {
             _toolCk(7);
@@ -442,6 +471,11 @@
                     txt_zQty98.Text = dy.daa008;
                     txt_yQty98.Text = dy.yQty98;
                     txt_kQty98.Text = dy.kQty98;
+                    //鍚庣洊鐮�
+                    txt_zQty100.Text = dy.daa008;
+                    txt_yQty100.Text = dy.yQty100;
+                    txt_kQty100.Text = dy.kQty100;
+
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
@@ -520,7 +554,7 @@
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
                     }
-                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text="";
+                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                 }
                 else
                     ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -648,7 +682,7 @@
             this.ucBtnPrint1.rptParameter = "rpt_daa{"
                   + txt_printRemark.Text.Trim()
                    + "," + ""
-                   + "," +  Gs.DevApp.ToolBox.UtilityHelper.ToDecimal( txt_yuliang_1.Text.Trim())
+                   + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                    + "," + txt_iCount_1.Text.Trim()
                    + "," + txt_psnQty_1.Text.Trim()
                    + "}";
@@ -686,7 +720,7 @@
         }
 
         /// <summary>
-        /// 杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
+        /// 杩欐槸鍚庣洊鐮�
         /// </summary>
         private void _print100()
         {
@@ -700,12 +734,19 @@
                 this.ucBtnPrint100.rptParameter = "return false";
                 return;
             }
-            this.ucBtnPrint100.rptParameter = "rpt_hgm{"
-                  + "100"
+            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_100.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
+                txt_iCount_100.Focus();
+                this.ucBtnPrint100.rptParameter = "return false";
+                return;
+            }
+            this.ucBtnPrint100.rptParameter = "rpt_trace{"
+                   + ""
                    + "," + ""
                    + "," + ""
-                   + "," + ""
-                   + "," + ""
+                   + "," + txt_iCount_100.Text.Trim()
+                   + "," + 1
                    + "}";
         }
 

--
Gitblit v1.9.3