diff --git a/WebApi/Controllers/DeliverController.cs b/WebApi/Controllers/DeliverController.cs index a17dca8..3cde0fd 100755 --- a/WebApi/Controllers/DeliverController.cs +++ b/WebApi/Controllers/DeliverController.cs @@ -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 suppliers = new List(); - 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(); + 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().ToList(); List purchasers = new List(); - 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(); + 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().ToList(); // 产品类型:取生产排程中人为维护的类型值 List productTypes = new List();