From a89f2c46d1f53a4d9e23dc76b949b40d2b2b18a6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 08 二月 2025 08:22:22 +0800
Subject: [PATCH] 采购退货

---
 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs |   83 +++++++++++++++++------------------------
 1 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 0cb3b02..c738bda 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -37,18 +37,15 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             getTree();
-            txt_docCode.EditValueChanged += Txt_docCode_EditValueChanged;
-            txxtItem1.EditValueChanged += TxxtItem1_EditValueChanged;
-            txxtItem2.EditValueChanged += TxxtItem1_EditValueChanged;
-            txxtItem3.EditValueChanged += TxxtItem1_EditValueChanged;
-            txxtItem4.EditValueChanged += TxxtItem1_EditValueChanged;
-            txt_noLength.ValueChanged += Txt_noLength_ValueChanged;
-            txt_isIncludeDoc.CheckedChanged +=
-                Txt_flagIncludeDocCode_CheckedChanged;
-            txt_isSpilit.CheckedChanged +=
-                Txt_flagIncludeDocCode_CheckedChanged;
+            txt_docCode.EditValueChanged += (s, e) => { DoPreviewCode(); };
+            txxtItem1.EditValueChanged += (s, e) => { DoPreviewCode(); };
+            txxtItem2.EditValueChanged += (s, e) => { DoPreviewCode(); };
+            txxtItem3.EditValueChanged += (s, e) => { DoPreviewCode(); };
+            txxtItem4.EditValueChanged += (s, e) => { DoPreviewCode(); };
+            txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
+            txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
+            txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
         }
-
 
         /// <summary>
         ///     鍒嗛〉浜嬩欢
@@ -121,9 +118,10 @@
                 if (_rtn.rtnCode > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 0)
-                        getPageList(this.pageBar1.CurrentPage);
+                    { }
                     else
                         Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
                 }
                 MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
@@ -144,8 +142,15 @@
                 getModel(lbGuid.Text.Trim());
             else
             {
-               
-                getPageList(1);
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
             }
         }
 
@@ -166,7 +171,7 @@
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
             UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
-            txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled =txxtItem4.Enabled = panelControl1.Enabled = true;
+            txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = true;
         }
 
         /// <summary>
@@ -218,7 +223,7 @@
 
             var _obj = new
             {
-                guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //涓诲缓
+                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 docCode = txt_docCode.EditValue.ToString(),
                 docFormat = txt_docFormat.Text,
                 noLength = txt_noLength.Value.ToString(),
@@ -264,11 +269,10 @@
                     gcMain.BindingContext = new BindingContext();
                     gcMain.DataSource = dt;
                     gcMain.ForceInitialize();
-                    int dddd = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.TotalPages = dddd;
-                    pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.setTxt();
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                    gridView1.BestFitColumns();
                 }
                 else
                 {
@@ -339,6 +343,8 @@
             dataTable.Rows.Add("DBSQ(璋冩嫧鐢宠鍗�)");//V
             dataTable.Rows.Add("GDPC(宸ュ崟鎺掍骇)");//V
             dataTable.Rows.Add("WWPC(濮斿鎺掍骇)");//V
+            dataTable.Rows.Add("CKSQ(鍑哄簱鐢宠)");//V
+            dataTable.Rows.Add("RKSQ(鍏ュ簱鐢宠)");//V
             dataTable.Rows.Add("TL(閫�鏂欏崟)");
             dataTable.Rows.Add("IN(鍏ュ簱鍗�)");
             dataTable.Rows.Add("SC(鐢熶骇宸ュ崟)");
@@ -348,24 +354,9 @@
             txt_docCode.Properties.DataSource = dataTable;
             txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
             txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
-            txt_docCode.Properties.TextEditStyle =TextEditStyles.DisableTextEditor;
+            txt_docCode.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
         }
-        private void Txt_flagIncludeDocCode_CheckedChanged(object sender,
-            EventArgs e)
-        {
-            DoPreviewCode();
-        }
-
-        private void Txt_noLength_ValueChanged(object sender, EventArgs e)
-        {
-            DoPreviewCode();
-        }
-
-        private void TxxtItem1_EditValueChanged(object sender, EventArgs e)
-        {
-            DoPreviewCode();
-        }
-
+    
         private void DoPreviewCode()
         {
             if (txt_docCode.Enabled == false
@@ -383,7 +374,6 @@
             }
             else
             {
-                // txtRuleFormat="<骞村勾>", "<骞村勾骞村勾>", "<鏈堟湀>", "<鏃ユ棩>" });
                 var preview = txt_docFormat.Text;
                 var length = int.Parse(txt_noLength.Value.ToString());
                 var docCode = "";
@@ -397,13 +387,8 @@
                 preview = preview.Replace("<鏃ユ棩>", "18");
                 preview = preview + (txt_isSpilit.Checked ? "-" : "") +
                           "8".PadLeft(length, '0');
-                lblPreview.Text = "鐢熸垚缂栧彿锛�" + preview;
+                lblPreview.Text = "鏍蜂緥锛�" + preview;
             }
-        }
-
-        private void Txt_docCode_EditValueChanged(object sender, EventArgs e)
-        {
-            DoPreviewCode();
         }
 
         /// <summary>
@@ -441,23 +426,25 @@
             };
             try
             {
-                var strJson = UtilityHelper.HttpPost("","General/GeneralCheck",
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                 if (_rtn.rtnCode > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
                         getModel(lbGuid.Text.Trim());
-                    else
-                        getPageList(this.pageBar1.CurrentPage);
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "", "", picCheckBox, this, _inFieldValue.ToString());
                 }
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3