fix: GetDeliveryList 物料合并 + 补汇总字段 + 前端 calcAvailable bug

- 后端 GetDeliveryList 从排程维度改为物料维度(相同 ChildMaterialId 跨排程多行 → 合并 1 行)
- 风险取最严重、停线日/到货日取最早、供应商/采购员去重逗号拼接
- 新增汇总字段:峰值日需(DailyRequirement 改口径)、到货计划数量 ArrivalQty、PO总量 PoTotalQty、申请单总量 ReqTotalQty
- 新增 ProductCode(该物料用于哪些产品,从 Product_BOM_Detail 查)
- 过滤已结束排程(INNER JOIN Production_Schedule WHERE PlanEndDate>=今天)
- 供应商筛选从精确匹配改为 LIKE(支持逗号拼接多值)
- 前端表头重排 18→21 列,新增峰值日需/到货计划/PO总量/申请单用列
- 修复 calcAvailable 缺 ReceivedQty 的 bug(之前 AvailableStock 公式前后端不一致)
- 新增 openEditMultiple 多排程编辑选择器(合并后一个物料关联多个 DeliveryId)

影响范围:仅 GetDeliveryList 一个接口 + material_delivery.html 局部
回滚:git revert 本 commit 或 cp .bak_20261109 覆盖
This commit is contained in:
Gaussian committed 2026-11-09 21:13:09 +08:00
1 parent 03489dd9c1
commit 582bcb8764
2 files changed
+273 -70

No files matched your search

+222 -50
View File
@@ -2360,8 +2360,10 @@ LEFT JOIN #SupByMat SP ON SP.MaterialCode=D.ChildMaterialId;
#region ===== 物料交付维护 =====
/// <summary>
/// 获取物料交付列表(分页,全局物料维度)
/// 日需求=所有生产排程对该物料的每日需求累计;ProductTypes=该物料关联的所有产品类型
/// 获取物料交付列表(分页,全局物料维度合并版)
/// 相同物料跨排程多行 → 按 ChildMaterialId 合并成 1 行;
/// 风险取最严重、停线日/到货日取最早、供应商/采购员逗号拼接去重;
/// 补充汇总字段:峰值日需求、申请单总量、PO总量、到货计划数量。
/// </summary>
[HttpGet]
public IHttpActionResult GetDeliveryList(string productCode = "", string productType = "", string supplier = "",
@@ -2369,67 +2371,237 @@ LEFT JOIN #SupByMat SP ON SP.MaterialCode=D.ChildMaterialId;
{
try
{
string where = " WHERE 1=1 ";
if (!string.IsNullOrEmpty(productType))
where += $" AND D.ProductTypes LIKE '%{Sql(productType)}%' ";
if (!string.IsNullOrEmpty(supplier)) where += $" AND D.Supplier=N'{Sql(supplier)}' ";
if (!string.IsNullOrEmpty(purchaser)) where += $" AND D.Purchaser=N'{Sql(purchaser)}' ";
if (page < 1) page = 1;
if (pageSize < 1 || pageSize > 100000) pageSize = 50;
int offset = (page - 1) * pageSize;
string todayStr = DateTime.Now.ToString("yyyy-MM-dd");
string where = " WHERE S.PlanEndDate>='" + todayStr + "' ";
if (!string.IsNullOrEmpty(productType)) where += $" AND (','+ISNULL(D.ProductTypes,'')+',') LIKE '%,{Sql(productType)},%' ";
if (!string.IsNullOrEmpty(supplier)) where += $" AND ISNULL(D.Supplier,'') LIKE N'%{Sql(supplier)}%' ";
if (!string.IsNullOrEmpty(purchaser)) where += $" AND ISNULL(D.Purchaser,'') LIKE N'%{Sql(purchaser)}%' ";
if (!string.IsNullOrEmpty(risk)) where += $" AND D.DeliveryRisk=N'{Sql(risk)}' ";
if (!string.IsNullOrEmpty(bomLevel)) where += $" AND D.BOMLevel={Int(bomLevel)} ";
if (!string.IsNullOrEmpty(keyword)) where += $" AND (D.ChildMaterialId LIKE '%{Sql(keyword)}%' OR D.MaterialName LIKE N'%{Sql(keyword)}%') ";
if (!string.IsNullOrEmpty(keyword))
{
string kw = Sql(keyword);
where += $" AND (D.ChildMaterialId LIKE '%{kw}%' OR D.MaterialName LIKE N'%{kw}%' OR S.ProductCode LIKE '%{kw}%') ";
}
// 统计总记录数
DataTable dtCount = db.ExecuteTable($"SELECT COUNT(*) AS CNT FROM Material_Delivery D {where}");
int total = Int(dtCount.Rows[0]["CNT"]);
int offset = (page - 1) * pageSize;
// 1) 全量查 Material_Delivery + INNER JOIN Production_Schedule 过滤未结束排程
DataTable dt = db.ExecuteTable($@"
SELECT D.*,
(SELECT ISNULL(SUM(R.DailyRequirement),0) FROM Material_Requirement R
WHERE R.ChildMaterialId=D.ChildMaterialId AND R.PlanDate>=CONVERT(date,GETDATE())) AS DailyRequirement,
(SELECT MIN(PlanDate) FROM Material_Requirement R
WHERE R.ChildMaterialId=D.ChildMaterialId AND R.PlanDate>=CONVERT(date,GETDATE())) AS FirstNeedDate
SELECT D.Id, D.ScheduleId, D.ProductCode, D.BOMVersion,
D.ChildMaterialId, D.MaterialName, D.BOMLevel, D.DeliveryRisk,
D.AvailableStock, D.ExpectedStopDate, D.ExpectedArrivalDate,
D.ZhenZeStock, D.JinJiangStock, D.ZiYangStock,
D.MassInTransit, D.ResearchInTransit, D.LineSideStock, D.ReceivedQty,
D.ERPStockQty, D.Remark, D.ProductTypes, D.Supplier, D.Purchaser,
D.InTransitQty, D.DeliveryProgress
FROM Material_Delivery D
INNER JOIN Production_Schedule S ON D.ScheduleId=S.Id
{where}
ORDER BY D.BOMLevel, D.ChildMaterialId
OFFSET {offset} ROWS FETCH NEXT {pageSize} ROWS ONLY");
ORDER BY D.ChildMaterialId");
List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
// 2) 无数据直接返回
if (dt.Rows.Count == 0)
return Ok(new { success = true, data = new List<Dictionary<string, object>>(), total = 0, page, pageSize });
var allChildIds = dt.Rows.Cast<DataRow>().Select(r => "'" + Sql(r["ChildMaterialId"].ToString()) + "'").Distinct().ToList();
string allIdsList = string.Join(",", allChildIds);
var allDelIds = dt.Rows.Cast<DataRow>().Select(r => "'" + Sql(r["Id"].ToString()) + "'").Distinct().ToList();
string allDelIdsList = string.Join(",", allDelIds);
// 3) 批量聚合:该物料用于哪些产品(从 BOM 展开 Product_BOM_Detail.ProductCode)
Dictionary<string, List<string>> prodCodeMap = new Dictionary<string, List<string>>();
DataTable pcDt = db.ExecuteTable($@"
SELECT DISTINCT BD.ChildMaterialId, BD.ProductCode
FROM Product_BOM_Detail BD
WHERE BD.ChildMaterialId IN ({allIdsList}) AND ISNULL(BD.IsVirtual,0)=0");
foreach (DataRow pr in pcDt.Rows)
{
string mid = pr["ChildMaterialId"].ToString();
string pc = pr["ProductCode"].ToStringEx();
if (!prodCodeMap.ContainsKey(mid)) prodCodeMap[mid] = new List<string>();
if (!string.IsNullOrEmpty(pc) && !prodCodeMap[mid].Contains(pc)) prodCodeMap[mid].Add(pc);
}
// 4) 批量聚合:申请单总量 / PO总量 / 到货计划数量 / 峰值单日需求
string yearStart = new DateTime(DateTime.Now.Year, 1, 1).ToString("yyyy-MM-dd");
Dictionary<string, decimal> reqQtyMap = new Dictionary<string, decimal>();
Dictionary<string, decimal> poQtyMap = new Dictionary<string, decimal>();
Dictionary<string, decimal> arrivalQtyMap = new Dictionary<string, decimal>();
Dictionary<string, decimal> peakDailyMap = new Dictionary<string, decimal>();
// 申请单总量(量产 CGSQD01/20 + 研发 CGSQD07)
DataTable reqDt = db.ExecuteTable($@"
SELECT M.FNUMBER AS MaterialCode, SUM(ISNULL(S1.FQTY,0)) AS ReqQty
FROM P_PUR_Requisition S
INNER JOIN P_PUR_RequisitionENTRY S1 ON S.FINTERID=S1.FINTERID
INNER JOIN T_BAS_BILLTYPE S2 ON S.FBILLTYPEID=S2.FINTERID
INNER JOIN T_BD_MATERIAL M ON S1.FMATERIALID=M.FINTERID
WHERE S.FSTATUS='40' AND S.FDATE>='{yearStart}' AND S.FDELETED=0
AND S2.FNUMBER IN ('CGSQD01_SYS','CGSQD20_SYS','CGSQD07_SYS')
AND M.FNUMBER IN ({allIdsList})
GROUP BY M.FNUMBER");
foreach (DataRow rr in reqDt.Rows) reqQtyMap[rr["MaterialCode"].ToString()] = Dec(rr["ReqQty"]);
// PO 总量(量产 CGDD01/02/21 排除 GSSH + 研发 CGDD11)
DataTable poDt = db.ExecuteTable($@"
SELECT M.FNUMBER AS MaterialCode, SUM(ISNULL(S1.FQTY,0)) AS PoQty
FROM T_PUR_POORDER S
INNER JOIN T_PUR_POORDERENTRY S1 ON S.FINTERID=S1.FINTERID
INNER JOIN T_BAS_BILLTYPE S2 ON S.FBILLTYPEID=S2.FINTERID
LEFT JOIN T_BAS_ASSISTANTDATAENTRY S3 ON S1.F_RESEARCHPROJECT=S3.FINTERID
INNER JOIN T_BD_MATERIAL M ON S1.FMATERIALID=M.FINTERID
WHERE S.FSTATUS='40' AND S.FDATE>='{yearStart}' AND S.FDELETED=0
AND ((S2.FNUMBER IN ('CGDD01_SYS','CGDD02_SYS','CGDD21_SYS') AND ISNULL(S3.FNUMBER,'')<>'GSSH')
OR S2.FNUMBER='CGDD11_SYS')
AND M.FNUMBER IN ({allIdsList})
GROUP BY M.FNUMBER");
foreach (DataRow rr in poDt.Rows) poQtyMap[rr["MaterialCode"].ToString()] = Dec(rr["PoQty"]);
// 到货计划数量(按 DeliveryId 聚合 Arrival_Plan,只计有预计到货日的批次)
var delIdList = dt.Rows.Cast<DataRow>().Select(r => r["Id"].ToString()).Distinct().ToList();
foreach (string batch in BuildInBatches(delIdList))
{
DataTable arrDt = db.ExecuteTable($@"
SELECT DeliveryId, SUM(ISNULL(ArrivalQty,0)) AS ArrivalQty
FROM Arrival_Plan
WHERE DeliveryId IN ({batch}) AND ExpectedArrivalDate IS NOT NULL
GROUP BY DeliveryId");
foreach (DataRow rr in arrDt.Rows) arrivalQtyMap[rr["DeliveryId"].ToString()] = Dec(rr["ArrivalQty"]);
}
// 峰值单日需求:按日期汇总后取最大(口径与停线日计算一致)
DataTable peakDt = db.ExecuteTable($@"
SELECT T.ChildMaterialId, MAX(T.DayQty) AS PeakDaily
FROM (
SELECT R.ChildMaterialId, R.PlanDate, SUM(ISNULL(R.DailyRequirement,0)) AS DayQty
FROM Material_Requirement R
INNER JOIN Production_Schedule S ON R.ScheduleId=S.Id
WHERE R.ChildMaterialId IN ({allIdsList})
AND R.PlanDate >= '{todayStr}'
AND S.PlanEndDate >= '{todayStr}'
GROUP BY R.ChildMaterialId, R.PlanDate
) T
GROUP BY T.ChildMaterialId");
foreach (DataRow rr in peakDt.Rows) peakDailyMap[rr["ChildMaterialId"].ToString()] = Dec(rr["PeakDaily"]);
// 5) 内存按 ChildMaterialId 合并(相同物料多行 → 1 行)
List<string> matOrder = new List<string>();
Dictionary<string, List<DataRow>> matGroups = new Dictionary<string, List<DataRow>>();
foreach (DataRow r in dt.Rows)
{
list.Add(new Dictionary<string, object>
string mid = r["ChildMaterialId"].ToString();
if (!matGroups.ContainsKey(mid)) { matGroups[mid] = new List<DataRow>(); matOrder.Add(mid); }
matGroups[mid].Add(r);
}
List<Dictionary<string, object>> aggList = new List<Dictionary<string, object>>();
foreach (string mid in matOrder)
{
List<DataRow> rows = matGroups[mid];
string stopDate = "", arrDate = "";
string riskVal = rows[0]["DeliveryRisk"].ToStringEx();
string materialName = "";
int bomLevel = int.MaxValue;
decimal arrivalSum = 0;
HashSet<string> supSet = new HashSet<string>(), purSet = new HashSet<string>(),
ptSet = new HashSet<string>(), bvSet = new HashSet<string>(), rmkSet = new HashSet<string>();
List<string> delIdList = new List<string>();
foreach (DataRow r in rows)
{
["Id"] = r["Id"].ToStringEx(),
["ScheduleId"] = r["ScheduleId"].ToStringEx(),
["ProductCode"] = r["ProductCode"].ToStringEx(),
["BOMVersion"] = r["BOMVersion"].ToStringEx(),
["ChildMaterialId"] = r["ChildMaterialId"].ToStringEx(),
["MaterialName"] = r["MaterialName"].ToStringEx(),
["BOMLevel"] = r["BOMLevel"].ToStringEx(),
["ProductTypes"] = r["ProductTypes"].ToStringEx(),
["Supplier"] = r["Supplier"].ToStringEx(),
["Purchaser"] = r["Purchaser"].ToStringEx(),
["ExpectedStopDate"] = DateStr(r["ExpectedStopDate"]),
["ExpectedArrivalDate"] = DateStr(r["ExpectedArrivalDate"]),
["DeliveryRisk"] = r["DeliveryRisk"].ToStringEx(),
["ZhenZeStock"] = NumStr(r["ZhenZeStock"]),
["JinJiangStock"] = NumStr(r["JinJiangStock"]),
["ZiYangStock"] = NumStr(r["ZiYangStock"]),
["ERPStockQty"] = NumStr(r["ERPStockQty"]),
["InTransitQty"] = NumStr(r["InTransitQty"]),
["LineSideStock"] = NumStr(r["LineSideStock"]),
["MassInTransit"] = NumStr(r["MassInTransit"]),
["ResearchInTransit"] = NumStr(r["ResearchInTransit"]),
["ReceivedQty"] = NumStr(r["ReceivedQty"]),
["AvailableStock"] = NumStr(r["AvailableStock"]),
["DeliveryProgress"] = r["DeliveryProgress"].ToStringEx(),
["Remark"] = r["Remark"].ToStringEx(),
["DailyRequirement"] = NumStr(r["DailyRequirement"]),
["FirstNeedDate"] = DateStr(r["FirstNeedDate"])
string sd = DateStr(r["ExpectedStopDate"]);
if (!string.IsNullOrEmpty(sd) && (string.IsNullOrEmpty(stopDate) || string.Compare(sd, stopDate) < 0)) stopDate = sd;
string ad = DateStr(r["ExpectedArrivalDate"]);
if (!string.IsNullOrEmpty(ad) && (string.IsNullOrEmpty(arrDate) || string.Compare(ad, arrDate) < 0)) arrDate = ad;
string rk = r["DeliveryRisk"].ToStringEx();
if (RiskOrder(rk) < RiskOrder(riskVal)) riskVal = rk;
string mn = r["MaterialName"].ToStringEx();
if (mn.Length > materialName.Length) materialName = mn;
int bl = Int(r["BOMLevel"]);
if (bl < bomLevel) bomLevel = bl;
string sp = r["Supplier"].ToStringEx(); if (!string.IsNullOrEmpty(sp)) supSet.Add(sp);
string pu = r["Purchaser"].ToStringEx(); if (!string.IsNullOrEmpty(pu)) purSet.Add(pu);
string pt = r["ProductTypes"].ToStringEx(); if (!string.IsNullOrEmpty(pt)) ptSet.Add(pt);
string bv = r["BOMVersion"].ToStringEx(); if (!string.IsNullOrEmpty(bv)) bvSet.Add(bv);
string rm = r["Remark"].ToStringEx(); if (!string.IsNullOrEmpty(rm)) rmkSet.Add(rm);
string did = r["Id"].ToString();
delIdList.Add(did);
if (arrivalQtyMap.ContainsKey(did)) arrivalSum += arrivalQtyMap[did];
}
decimal erpStock = rows.Max(r => Dec(r["ERPStockQty"]));
decimal received = rows.Max(r => Dec(r["ReceivedQty"]));
decimal lineSide = rows.Max(r => Dec(r["LineSideStock"]));
decimal massTransit = rows.Max(r => Dec(r["MassInTransit"]));
decimal researchTransit = rows.Max(r => Dec(r["ResearchInTransit"]));
decimal availStock = rows.Max(r => Dec(r["AvailableStock"]));
decimal reqQty = reqQtyMap.ContainsKey(mid) ? reqQtyMap[mid] : 0;
decimal poQty = poQtyMap.ContainsKey(mid) ? poQtyMap[mid] : 0;
decimal arrQty = arrivalSum;
string productCodes = prodCodeMap.ContainsKey(mid) ? string.Join(",", prodCodeMap[mid]) : "";
aggList.Add(new Dictionary<string, object>
{
// 主键 / 操作
["Id"] = rows[0]["Id"].ToStringEx(), // 第一行 DeliveryId(向后兼容 openEdit)
["DeliveryIds"] = string.Join(",", delIdList), // 所有 DeliveryId(逗号分隔)
["ChildMaterialId"] = mid,
["MaterialName"] = materialName,
["BOMLevel"] = bomLevel == int.MaxValue ? "" : bomLevel.ToString(),
["ProductCode"] = productCodes, // 该物料用于哪些产品(从 BOM 展开)
["BOMVersion"] = string.Join(",", bvSet),
// 风险 + 日期
["DeliveryRisk"] = riskVal,
["ExpectedStopDate"] = stopDate,
["ExpectedArrivalDate"] = arrDate,
// 库存明细(物料级,同一物料各排程行相同,取 MAX)
["AvailableStock"] = NumStr(availStock),
["ZhenZeStock"] = NumStr(rows.Max(r => Dec(r["ZhenZeStock"]))),
["JinJiangStock"] = NumStr(rows.Max(r => Dec(r["JinJiangStock"]))),
["ZiYangStock"] = NumStr(rows.Max(r => Dec(r["ZiYangStock"]))),
["LineSideStock"] = NumStr(lineSide),
["MassInTransit"] = NumStr(massTransit),
["ResearchInTransit"] = NumStr(researchTransit),
["InTransitQty"] = NumStr(rows.Max(r => Dec(r["InTransitQty"]))),
["ReceivedQty"] = NumStr(received),
["ERPStockQty"] = NumStr(erpStock),
// 汇总口径(GetBoardRiskList 同款)
["StockQty"] = NumStr(received + erpStock + lineSide), // 已收货 + 三地 + 线边
["TotalInTransitQty"] = NumStr(reqQty + poQty + erpStock), // 申请 + PO + 三地
["ArrivalPlanQty"] = NumStr(erpStock + arrQty), // 三地 + 到货计划
["ReqTotalQty"] = NumStr(reqQty), // 申请单总量
["PoTotalQty"] = NumStr(poQty), // PO 总量
["ArrivalQty"] = NumStr(arrQty), // 到货计划数量(汇总)
// 峰值日需求(所有排程按日期叠加后取 MAX)
["DailyRequirement"] = NumStr(peakDailyMap.ContainsKey(mid) ? peakDailyMap[mid] : 0),
// 去重拼接
["ProductTypes"] = string.Join(",", ptSet),
["Supplier"] = string.Join(",", supSet),
["Purchaser"] = string.Join(",", purSet),
["Remark"] = string.Join(",", rmkSet)
});
}
return Ok(new { success = true, data = list, total = total, page = page, pageSize = pageSize });
// 6) 排序 + 内存分页(合并后的行数即总数)
aggList.Sort((a, b) =>
{
int ro = RiskOrder(a["DeliveryRisk"].ToStringEx()) - RiskOrder(b["DeliveryRisk"].ToStringEx());
if (ro != 0) return ro;
return string.Compare(a["ChildMaterialId"].ToStringEx(), b["ChildMaterialId"].ToStringEx());
});
int total = aggList.Count;
List<Dictionary<string, object>> pageList = aggList.Skip(offset).Take(pageSize).ToList();
return Ok(new { success = true, data = pageList, total = total, page = page, pageSize = pageSize });
}
catch (Exception ex)
{