From 6b7f640c7952a3948b896d4c585d416f546788a1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 17 七月 2025 08:17:12 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 58bc09a..e850eef 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -37,6 +37,7 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
+            //鎵撳嵃浜嬩欢
             this.ucBtnPrint1.btnPrintClick += (s, e) =>
             {
                 string rowGuid = lbMxGuid.Text.Trim();
@@ -61,50 +62,56 @@
                     this.ucBtnPrint1.rptParameter = "return false";
                     return;
                 }
-                this.ucBtnPrint1.rptParameter = "rpt_Arrival{" + lbMxGuid.Text.Trim()
+                this.ucBtnPrint1.rptParameter = "rpt_Arrival{"
+                       + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
                        + "," + ""
-                        + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
-                       + "," + txt_iCount_1.Text.Trim()
-                       + "," + txt_psnQty_1.Text.Trim()
+                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+                       + "," + txt_iCount_1.Text.Trim()//寮犳暟
+                       + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉$爜鏁伴噺
                        + "}";
                 txt_iCount_1.Text = "";
                 txt_psnQty_1.Text = "";
             };
+            //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
             this.ucBtnPrint1.btnAllClick += (s, e) =>
             {
                 string rowGuid = lbMxGuid.Text.Trim();
                 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
-                {
-                    string rptParameter = "rpt_Arrival{"
-                    + "100"
-                    + "," + ""
-                    + "," + ""
-                    + "," + ""
-                    + "," + ""
-                    + "," + strCodeList
-                    + "}";
-                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
+                if (strAction == "print") {
+                    try
                     {
-                        rpt.ShowDialog();
+                        string rptParameter = "rpt_Arrival{"
+                        + "100"//閲嶆墦閮芥槸浼�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);
+                    }
                 }
             };
             gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-            //鑷姩璁$畻鎵撳嵃閲�
+            //鎵撳嵃鑷姩璁$畻
             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);

--
Gitblit v1.9.3