From 9a853780edf120c99712c15fd3b174fa08ef142c Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 27 八月 2025 18:23:43 +0800
Subject: [PATCH] 补料优化
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
index df28aa3..4be43bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
@@ -26,6 +26,7 @@
this.orgId = _orgId;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
getPageList(1);
+ getPageListWithFilter(2); // 浣跨敤杩囨护鏂规硶
SetupButtonClickEvent();
}
@@ -155,8 +156,18 @@
var dd = UtilityHelper.ReturnToTablePage(strReturn);
var dt = dd.rtnData.list;
- // 绛涢�夋帀kbsl涓�0鐨勬暟鎹�
DataTable filteredDt = FilterZeroKbsl(dt);
+
+ if (curPage == 1)
+ {
+ // 绛涢�夋帀kbsl涓�0鐨勬暟鎹�
+ filteredDt = FilterZeroKbsl(dt);
+ }
+ else
+ {
+ // 杩囨护dab006锛堥渶棰嗙敤閲忥級灏忎簬绛変簬ylQty锛堝凡棰嗙敤閲忥級鐨勬暟鎹�
+ filteredDt = FilterByDab006AndYlQty(dt);
+ }
gcMain.BindingContext = new BindingContext();
gcMain.DataSource = filteredDt;
@@ -210,5 +221,52 @@
return filteredTable;
}
+
+ /// <summary>
+ /// 杩囨护dab006锛堥渶棰嗙敤閲忥級灏忎簬绛変簬ylQty锛堝凡棰嗙敤閲忥級鐨勬暟鎹�
+ /// </summary>
+ /// <param name="sourceTable">婧愭暟鎹〃</param>
+ /// <returns>杩囨护鍚庣殑鏁版嵁琛�</returns>
+ private DataTable FilterByDab006AndYlQty(DataTable sourceTable)
+ {
+ if (sourceTable == null || sourceTable.Rows.Count == 0)
+ return sourceTable;
+
+ // 鍒涘缓鏂扮殑DataTable鏉ュ瓨鍌ㄨ繃婊ゅ悗鐨勬暟鎹�
+ DataTable filteredTable = sourceTable.Clone();
+
+ foreach (DataRow row in sourceTable.Rows)
+ {
+ // 妫�鏌ab006鍜寉lQty鍒楁槸鍚﹀瓨鍦�
+ if (sourceTable.Columns.Contains("dab006") && sourceTable.Columns.Contains("ylQty"))
+ {
+ object dab006Value = row["dab006"];
+ object ylQtyValue = row["ylQty"];
+
+ decimal dab006 = 0;
+ decimal ylQty = 0;
+
+ // 灏濊瘯杞崲涓篸ecimal
+ bool dab006Valid = dab006Value != null && dab006Value != DBNull.Value &&
+ decimal.TryParse(dab006Value.ToString(), out dab006);
+ bool ylQtyValid = ylQtyValue != null && ylQtyValue != DBNull.Value &&
+ decimal.TryParse(ylQtyValue.ToString(), out ylQty);
+
+ // 杩囨护鏉′欢锛歞ab006 >= ylQty
+ if (dab006Valid && ylQtyValid && dab006 <= ylQty)
+ {
+ filteredTable.ImportRow(row);
+ }
+ }
+ else
+ {
+ // 濡傛灉娌℃湁杩欎袱涓垪锛屼繚鐣欐墍鏈夎
+ filteredTable.ImportRow(row);
+ }
+ }
+
+ return filteredTable;
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3