From 719a47b4aff725d4224b85e2b2079983cb31cf89 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期二, 23 十二月 2025 13:28:36 +0800
Subject: [PATCH] 增加临时查询方案

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index a71254b..a0c5e50 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,5 +1,3 @@
-using DevExpress.Utils.VisualEffects;
-using DevExpress.XtraEditors;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sales;
 using Gs.DevApp.Entity;
@@ -10,8 +8,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -37,6 +33,7 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -153,7 +150,6 @@
                 this.ucBtnPrintAll1.mxList = lst;
             };
             #endregion
-
             //閿�鍞粍缁�
             txt_salesOrg.EditChanged += (s, e) =>
             {
@@ -210,7 +206,7 @@
                                     _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
                                     _row["xxDw"] = dym.xxDw;
                                     _row["salesQuantity"] = dym.salesQuantity;
-                                    _row["isFreeChk"] = dym.isFreeChk;
+                                    _row["isFreeChk"] = false;
                                     _row["fhQuantity"] = dym.fhQuantity;
                                     gvMx1.UpdateCurrentRow();
                                     _Table.Rows.Add(_row);
@@ -253,7 +249,7 @@
                                     _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
                                     _row["xxDw"] = dym.xxDw;
                                     _row["salesQuantity"] = dym.salesQuantity;
-                                    _row["isFreeChk"] = dym.isFreeChk;
+                                    _row["isFreeChk"] = false;
                                     _row["fhQuantity"] = dym.fhQuantity;
                                     gvMx1.UpdateCurrentRow();
                                     _Table.Rows.Add(_row);
@@ -295,7 +291,7 @@
                                 _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
                                 _row["xxDw"] = dym.xxDw;
                                 _row["salesQuantity"] = dym.salesQuantity;
-                                _row["isFreeChk"] = dym.isFreeChk;
+                                _row["isFreeChk"] = false;
                                 _row["fhQuantity"] = dym.fhQuantity;
                                 gvMx1.UpdateCurrentRow();
                                 _Table.Rows.Add(_row);
@@ -325,7 +321,6 @@
                 setSrm();
             };
         }
-
 
         /// <summary>
         /// 鎵撳嵃
@@ -665,6 +660,7 @@
                         Thlx = (row["returnType"].ToString()),
                         Thrq = (row["returnDate"].ToString()),
                         ItemId = (row["ItemId"].ToString()),
+                        IsFreeChk = (row["IsFreeChk"].ToString()),
                     });
                 }
             }
@@ -832,8 +828,16 @@
                 ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
-
-
+        /// <summary>
+        /// 瀹岀粨
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+        {
+            _toolCk(2);
+        }
         /// <summary>
         ///     瀹℃牳浜嬩欢
         /// </summary>
@@ -870,6 +874,9 @@
                 case 0:
                     strMsg = "鍙嶅鏍�";
                     break;
+                case 2:
+                    strMsg = "瀹岀粨";
+                    break;
             }
             ;
             toolBarMenu1.guidKey = "";

--
Gitblit v1.9.3