fix: GetOptions Supplier/Purchaser 拆逗号再 DISTINCT(之前直接 DISTINCT 把逗号拼接串当下拉 option)

This commit is contained in:
Gaussian committed 2026-11-10 13:40:49 +08:00
1 parent 8f8ac33743
commit 519b6cf470
1 file changed
+24 -4
+24 -4
View File
@@ -4358,13 +4358,33 @@ LEFT JOIN #SupByMat SP ON SP.MaterialCode=D.ChildMaterialId;
DataTable dtV = db.ExecuteTable("SELECT DISTINCT BOMVersion FROM Product_BOM_Master ORDER BY BOMVersion");
foreach (DataRow r in dtV.Rows) versions.Add(r[0].ToStringEx());
// Supplier / Purchaser 字段本身是逗号拼接的多值(一个物料可对应多个供应商/采购员)
// 直接 DISTINCT 会把整个拼接串当一个下拉 option,拆成单个值再 DISTINCT
List<object> suppliers = new List<object>();
DataTable dtS = db.ExecuteTable("SELECT DISTINCT Supplier FROM Material_Delivery WHERE Supplier<>'' ORDER BY Supplier");
foreach (DataRow r in dtS.Rows) suppliers.Add(r[0].ToStringEx());
DataTable dtS = db.ExecuteTable("SELECT ISNULL(Supplier,'') Supplier FROM Material_Delivery WHERE Supplier<>''");
var supSet = new HashSet<string>();
foreach (DataRow r in dtS.Rows)
{
foreach (var v in r[0].ToStringEx().Split(new[]{','}, StringSplitOptions.RemoveEmptyEntries))
{
var trimmed = v.Trim();
if (!string.IsNullOrEmpty(trimmed)) supSet.Add(trimmed);
}
}
suppliers = supSet.OrderBy(x => x).Cast<object>().ToList();
List<object> purchasers = new List<object>();
DataTable dtPu = db.ExecuteTable("SELECT DISTINCT Purchaser FROM Material_Delivery WHERE Purchaser<>'' ORDER BY Purchaser");
foreach (DataRow r in dtPu.Rows) purchasers.Add(r[0].ToStringEx());
DataTable dtPu = db.ExecuteTable("SELECT ISNULL(Purchaser,'') Purchaser FROM Material_Delivery WHERE Purchaser<>''");
var purSet = new HashSet<string>();
foreach (DataRow r in dtPu.Rows)
{
foreach (var v in r[0].ToStringEx().Split(new[]{','}, StringSplitOptions.RemoveEmptyEntries))
{
var trimmed = v.Trim();
if (!string.IsNullOrEmpty(trimmed)) purSet.Add(trimmed);
}
}
purchasers = purSet.OrderBy(x => x).Cast<object>().ToList();
// 产品类型:取生产排程中人为维护的类型值
List<object> productTypes = new List<object>();