From 3d46409edbd033d22cd0e781c36add3ef7f7f3a1 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 12 六月 2025 17:04:48 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |   76 +++++++++++++++++++++++++++++++++----
 1 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 48f91fa..02ee54e 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;
@@ -76,7 +76,7 @@
             {
                 _print98();
             };
-            //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
+            //杩欐槸鍚庣洊鐮�
             this.ucBtnPrint100.btnDesignClick += (s, e) =>
             {
                 ucBtnPrint100.rptParameter = "rpt_hgm{}";
@@ -84,6 +84,15 @@
             this.ucBtnPrint100.btnReportClick += (s, e) =>
             {
                 _print100();
+            };
+            //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
+            this.ucBtnPrint101.btnDesignClick += (s, e) =>
+            {
+                ucBtnPrint101.rptParameter = "rpt_qitao{}";
+            };
+            this.ucBtnPrint101.btnReportClick += (s, e) =>
+            {
+                _print101();
             };
             //瀵煎叆妯℃澘
             this.btnIn.Click += (s, e) =>
@@ -115,7 +124,6 @@
                 frm.ShowDialog();
             };
         }
-
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
@@ -256,10 +264,10 @@
         {
             _toolCk(7);
         }
-        //private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
-        //{
-        //    _toolCk(8);
-        //}
+        private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
+        {
+            _toolCk(8);
+        }
         private void ToolBarMenu1_btnWgClick(object sender, EventArgs e)
         {
             _toolCk(9);
@@ -554,6 +562,32 @@
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
                     }
+                    //鍔犱笂鎵撳嵃鏉冮檺
+                    JArray array5 = new JArray();
+                    foreach (var a in _job["rtnData"]["list5"])
+                    {
+                        if (a["blackName"].ToString() == "鎵樻澘鐮佹墦鍗�")
+                        {
+                            splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+                            continue;
+                        }
+                        if (a["blackName"].ToString() == "杩芥函鐮佹墦鍗�")
+                        {
+                            splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+                            continue;
+                        }
+                        if (a["blackName"].ToString() == "鍚庣洊鐮佹墦鍗�")
+                        {
+                            splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+                            continue;
+                        }
+                        if (a["blackName"].ToString() == "榻愬鏍囪瘑鍗℃墦鍗�")
+                        {
+                            xtraTabPage5.PageVisible = true;
+                            continue;
+                        }
+                    }
+
                     txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                 }
                 else
@@ -665,7 +699,7 @@
                 this.ucBtnPrint1.rptParameter = "return false";
                 return;
             }
-            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
+            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
                 txt_iCount_1.Focus();
@@ -741,7 +775,7 @@
                 this.ucBtnPrint100.rptParameter = "return false";
                 return;
             }
-            this.ucBtnPrint100.rptParameter = "rpt_trace{"
+            this.ucBtnPrint100.rptParameter = "rpt_hgm{"
                    + ""
                    + "," + ""
                    + "," + ""
@@ -751,6 +785,30 @@
         }
 
         /// <summary>
+        /// 杩欐槸榻愬
+        /// </summary>
+        private void _print101()
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_daa001, gridView1);
+            ucBtnPrint101.guidKey = rowGuid;
+            if (rowGuid.Length < 36)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+                this.ucBtnPrint101.rptParameter = "return false";
+                return;
+            }
+            this.ucBtnPrint101.rptParameter = "rpt_qitao{"
+                   + ""
+                   + "," + ""
+                   + "," + ""
+                   + "," + ""
+                   + "," + ""
+                   + "}";
+        }
+
+        /// <summary>
         /// 閲嶆墦
         /// </summary>
         /// <param name="sender"></param>

--
Gitblit v1.9.3