This commit is contained in:
梁骏愉
2025-03-15 15:03:34 +08:00
parent 17bb7e4131
commit 2306c8b7cf
69 changed files with 4199 additions and 324 deletions

View File

@@ -85,17 +85,26 @@ FROM #table1 t0
WHERE t0.FDOCUMENTSTATUS = 'C'
AND t0.FDATE between @startDate AND @endDate
)
SELECT t0.FBILLNO,t0.FID,t0.FEntryID,t0.FMATERIALID,t0.FUNITID,t0.FYEAR,t0.FCUSTID,t0.minDate,t0.maxDate
,CASE WHEN t0.最终数量 < (ISNULL(t1.FQTY,0) + ISNULL(t1.[2次调拨],0)) THEN 0 ELSE t0.最终数量 - (ISNULL(t1.FQTY,0) + ISNULL(t1.[2次调拨],0)) END AS '最终数量'
FROM #table1 t0
OUTER APPLY (
SELECT SUM(t1.FQTY) FQTY ,SUM(t1.[2次调拨]) [2次调拨]
FROM #发货通知单 t1
WHERE 1 = 1 AND t1.FMATERIALID = t0.FMATERIALID
AND t0.FCUSTID = t1.FCUSTOMERID
AND t1.FDATE BETWEEN t0.minDate AND t0.maxDate
) t1
,#最终数据 AS (
SELECT t0.FBILLNO,t0.FID,t0.FEntryID,t0.FMATERIALID,t0.FUNITID,t0.FYEAR,t0.FCUSTID,t0.minDate,t0.maxDate
,CASE WHEN t0.最终数量 < (ISNULL(t1.FQTY,0) + ISNULL(t1.[2次调拨],0)) THEN 0 ELSE t0.最终数量 - (ISNULL(t1.FQTY,0) + ISNULL(t1.[2次调拨],0)) END AS '最终数量'
,ISNULL(t1.FQTY,0) 'F_DelivQty',ISNULL(t1.[2次调拨],0) 'F_Direct2Qty'
,t0.最终数量 'F_OriginalQty'
FROM #table1 t0
OUTER APPLY (
SELECT SUM(t1.FQTY) FQTY ,SUM(t1.[2次调拨]) [2次调拨]
FROM #发货通知单 t1
WHERE 1 = 1 AND t1.FMATERIALID = t0.FMATERIALID
AND t0.FCUSTID = t1.FCUSTOMERID
AND t1.FDATE BETWEEN t0.minDate AND t0.maxDate
) t1
--ORDER BY t0.minDate ASC
)
SELECT t0.*
FROM #最终数据 t0
WHERE t0.最终数量 > 0
ORDER BY t0.minDate ASC
DROP TABLE #table1
";
//throw new Exception(sqlL);
@@ -140,9 +149,16 @@ DROP TABLE #table1
var baseUnitId_Id = MaterialBase["BaseUnitId_Id"].Long2Int();
var qty = decimal.Parse(item["最终数量"].ToString());
entity["Qty"] = qty;
entity["F_DelivQty"] = decimal.Parse(item["F_DelivQty"].ToString());
entity["F_Direct2Qty"] = decimal.Parse(item["F_Direct2Qty"].ToString());
entity["F_OriginalQty"] = decimal.Parse(item["F_OriginalQty"].ToString());
entity["F_W5Qty"] = 0;
entity["StartDate"] = item["minDate"];
entity["EndDate"] = item["maxDate"];
entity["F_Year"] = item["FYEAR"];
entity["FCloseStatus"] = "A";
////# 货主类型
//entity["FOwnerTypeId"] = item["FOWNERTYPEID"];
////# 货主