From 3da484ef1060100bfae2d82b56a4382e11a602de Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 27 八月 2025 18:27:04 +0800
Subject: [PATCH] 1、列表明细自适应 2、条码一键打印

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs |   70 +++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 5c925f2..6accb25 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -26,6 +26,9 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMxL1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMxL2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMxL3);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -274,40 +277,45 @@
         releaseNosStr  // s5 鈫� @in6锛歳eleaseNo鍒楄〃
                 };
 
-                string paramContent = string.Join(",", reportParams);
-                string rptParam = $"rpt_Arrival_One{{{paramContent}}}";
+                //string paramContent = string.Join(",", reportParams);
+                //string rptParam = $"rpt_Arrival_One{{{paramContent}}}";
+
+                //this.ucBtnPrintOne1.guidKey = mainGuid;
+                //this.ucBtnPrintOne1.rptParameter = rptParam;
 
                 this.ucBtnPrintOne1.guidKey = mainGuid;
-                this.ucBtnPrintOne1.rptParameter = rptParam;
+                this.ucBtnPrintOne1.rptParameter = "rpt_Arrival_One{"
+                    + string.Join(",", reportParams)  // 鎷兼帴reportParams鏁扮粍鍏冪礌
+                    + "}";
 
-                // 5. 璋冪敤棰勮锛堥�昏緫涓嶅彉锛�
-                try
-                {
-                    using (Form rptPreviewForm = new RptPreview(mainGuid, rptParam))
-                    {
-                        DialogResult previewResult = rptPreviewForm.ShowDialog();
-                        if (previewResult == DialogResult.OK)
-                        {
-                            getModel(mainGuid);
-                            Gs.DevApp.ToolBox.MsgHelper.ShowError($"鎵归噺鎵撳嵃瀹屾垚锛佸叡鎵撳嵃 {validReleaseNos.Count} 鏉℃湁鏁堟槑缁�");
-                        }
-                        else if (previewResult == DialogResult.Cancel)
-                        {
-                            Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢ㄦ埛鍙栨秷鎵归噺鎵撳嵃鎿嶄綔");
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    string errorMsg = $"鎵归噺鎵撳嵃寮傚父锛歿ex.Message}";
-                    if (ex.InnerException != null)
-                    {
-                        errorMsg += $"\n鍐呴儴閿欒锛歿ex.InnerException.Message}";
-                    }
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError(errorMsg);
-                    this.ucBtnPrintOne1.rptParameter = "return false";
-                }
-
+                /*  // 5. 璋冪敤棰勮锛堥�昏緫涓嶅彉锛�
+                  try
+                  {
+                      using (Form rptPreviewForm = new RptPreview(mainGuid, rptParam))
+                      {
+                          DialogResult previewResult = rptPreviewForm.ShowDialog();
+                          if (previewResult == DialogResult.OK)
+                          {
+                              getModel(mainGuid);
+                              Gs.DevApp.ToolBox.MsgHelper.ShowError($"鎵归噺鎵撳嵃瀹屾垚锛佸叡鎵撳嵃 {validReleaseNos.Count} 鏉℃湁鏁堟槑缁�");
+                          }
+                          else if (previewResult == DialogResult.Cancel)
+                          {
+                              Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢ㄦ埛鍙栨秷鎵归噺鎵撳嵃鎿嶄綔");
+                          }
+                      }
+                  }
+                  catch (Exception ex)
+                  {
+                      string errorMsg = $"鎵归噺鎵撳嵃寮傚父锛歿ex.Message}";
+                      if (ex.InnerException != null)
+                      {
+                          errorMsg += $"\n鍐呴儴閿欒锛歿ex.InnerException.Message}";
+                      }
+                      Gs.DevApp.ToolBox.MsgHelper.ShowError(errorMsg);
+                      this.ucBtnPrintOne1.rptParameter = "return false";
+                  }
+  */
                 // 6. 娓呯┖鎺т欢
                 txt_iCount_2.Text = "";
                 txt_psnQty_2.Text = "";

--
Gitblit v1.9.3