From b5a5f3fe2ee6b0db77b679c6713265e2393e1d90 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 21 二月 2025 15:32:10 +0800
Subject: [PATCH] 委外

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs |   51 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index d22c35b..dc26a85 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -28,9 +28,11 @@
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
-           Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "tbl013", "", (value) =>
+            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
             });
@@ -83,7 +85,7 @@
                 };
                 frm.ShowDialog();
             };
-            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+          
             this.ucBtnPrint1.btnDesignClick += (s, e) =>
             {
                 ucBtnPrint1.rptParameter = "rpt_wwtl{}";
@@ -113,7 +115,7 @@
                     this.ucBtnPrint1.rptParameter = "return false";
                     return;
                 }
-                this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
+                this.ucBtnPrint1.rptParameter = "rpt_wwtl{" + lbMxGuid.Text.Trim()
                        + "," + ""
                        + "," + ""
                        + "," + txt_iCount_1.Text.Trim()
@@ -121,14 +123,26 @@
                        + "}";
             };
         }
-         
+
         private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             await Task.Delay(100);
             getPageList(1);
         }
-       
+        /// <summary>
+        /// 鏃ュ織
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_billNo, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+        }
         /// <summary>
         /// 鍒嗛〉浜嬩欢
         /// </summary>
@@ -170,7 +184,7 @@
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                 lbGuid, txt_billNo, gridView1);
             toolBarMenu1.guidKey = rowGuid;
-            toolBarMenu1.rptParameter = "rpt_SCTL{}";
+            toolBarMenu1.rptParameter = "rpt_wwtl{}";
         }
         private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
         {
@@ -205,7 +219,7 @@
                 this.toolBarMenu1.rptParameter = "return false";
                 return;
             }
-            this.toolBarMenu1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
+            this.toolBarMenu1.rptParameter = "rpt_wwtl{" + lbMxGuid.Text.Trim()
                    + "," + ""
                    + "," + ""
                    + "," + txt_iCount_1.Text.Trim()
@@ -418,9 +432,14 @@
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 if (_rtn.rtnCode > 0)
                 {
-                    lbGuid.Text = _rtn.rtnData;
+                    lbGuid.Text = _rtn.rtnData.outGuid;
+                    txt_billNo.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                    gvList.Add(gvMx1);
+                    gvList.Add(gvMx2);
+                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+                    toolBarMenu1.currentAction = "";
                 }
             }
             catch (Exception ex)
@@ -507,6 +526,7 @@
                     DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                     if (dt.Rows.Count > 0)
                     {
+                        gcMx1.DataSource = null;
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
@@ -680,7 +700,6 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
 
         private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
@@ -694,13 +713,9 @@
                 txtWlgg.Text = row["tld004"].ToString();
                 txtWlmc.Text = row["tld003"].ToString();
                 txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
-                 //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
-                 //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
-                txtYdy.Text = "";//宸叉墦鍗版�婚噺
-                kyPrtQty.Text = "";//鍙墦鍗版�婚噺
+                txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+                txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
             }
         }
-
-       
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3