From ba0c935cafc358cd8dc85b002ce8befba22c04a1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 11 八月 2025 08:42:59 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |   62 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 7995916..57e13fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -124,32 +124,37 @@
                     lbGuid, txt_daa001, gridView1);
                 SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�");
                 string strCodeList = "";
+                string strAction = "";
                 frm.UpdateParent += (ss, ee) =>
                 {
                     strCodeList = ee.StringSingle;
+                    strAction = ee.Data;
                 };
                 frm.ShowDialog();
                 if (string.IsNullOrEmpty(strCodeList))
                     return;
-                try
+                if (strAction == "print")
                 {
-                    string rptParameter = "rpt_trace{"
-                    + "100"
-                    + "," + ""
-                    + "," + ""
-                    + "," + ""
-                    + "," + ""
-                    + "," + strCodeList
-                    + "}";
-                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
+                    try
                     {
-                        rpt.ShowDialog();
+                        string rptParameter = "rpt_trace{"
+                        + "100"
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + strCodeList
+                        + "}";
+                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
+                        {
+                            rpt.ShowDialog();
+                        }
+                        frm.Close();
                     }
-                    frm.Close();
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.ShowError(ex.Message);
+                    catch (Exception ex)
+                    {
+                        MsgHelper.ShowError(ex.Message);
+                    }
                 }
             };
             //杩欐槸鍚庣洊鐮�
@@ -236,6 +241,7 @@
                 };
                 frm.ShowDialog();
             };
+            //缁存姢瀹㈡埛妯＄増
             this.btnDesign.Click += (s, e) =>
             {
                 EasyRptEdtShow frm = new EasyRptEdtShow();
@@ -720,7 +726,6 @@
                             continue;
                         }
                     }
-
                     //2025-7-20鍔犱笂浜х嚎纭璁板綍
                     JArray array6 = new JArray();
                     foreach (var a in _job["rtnData"]["list6"])
@@ -777,6 +782,8 @@
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
                     }
                     txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
+                    txt_iCount_98.Text = txt_kQty98.Text;//杩芥函鐮�
+                    txt_iCount_100.Text = txt_kQty100.Text;//鍚庣洊鐮�
                 }
                 else
                     ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -1000,5 +1007,26 @@
                    + "}";
         }
         #endregion
+
+        /// <summary>
+        /// 鍙樻洿鍐呭寘瑁呮暟閲�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rptTuoBanNbz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            var rowhandle = gvMx2.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvMx2.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙樻洿鍐呭寘瑁呮暟閲忓悧锛�"))
+                    return;
+                var frm = new Frm_WomdaaNbz(mxGuid);
+                frm.ShowDialog();
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3