bring func up to speed

This commit is contained in:
Paul Trowbridge 2025-08-07 23:35:09 -04:00
parent 4602db59bb
commit af5e4d202b

View File

@ -1,4 +1,5 @@
DROP FUNCTION pricing.single_price_call_fn; DROP FUNCTION IF EXISTS pricing.single_price_call_fn;
GO
CREATE FUNCTION pricing.single_price_call_fn ( CREATE FUNCTION pricing.single_price_call_fn (
@bill VARCHAR(100), @bill VARCHAR(100),
@ -28,10 +29,12 @@ RETURNS @queue TABLE (
last_order NVARCHAR(10), last_order NVARCHAR(10),
last_quote NVARCHAR(10), last_quote NVARCHAR(10),
tprice NUMERIC(20,5), tprice NUMERIC(20,5),
tmath NVARCHAR(MAX),
guidance_price NUMERIC(20,5), guidance_price NUMERIC(20,5),
guidance_reason NVARCHAR(MAX), guidance_reason NVARCHAR(MAX),
expl NVARCHAR(MAX), expl NVARCHAR(MAX),
ui_json NVARCHAR(MAX) ui_json NVARCHAR(MAX),
partgroup VARCHAR(100)
) )
AS AS
BEGIN BEGIN
@ -80,7 +83,8 @@ BEGIN
END END
ELSE bc.plevel ELSE bc.plevel
END, END,
stlc = substring(q.part,1,8) stlc = substring(q.part,1,8),
partgroup = i.partgroup
FROM @queue q FROM @queue q
LEFT JOIN rlarp.cust bc ON bc.code = q.bill LEFT JOIN rlarp.cust bc ON bc.code = q.bill
LEFT JOIN rlarp.cust sc ON sc.code = q.ship LEFT JOIN rlarp.cust sc ON sc.code = q.ship
@ -91,21 +95,9 @@ BEGIN
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
UPDATE q UPDATE q
SET SET
tprice = tp.price, tprice = tp.price
expl = ( ,tmath = JSON_QUERY(tp.math)
SELECT ,volume_range = CONCAT(tp.lower_bound, '-', ISNULL(CAST(tp.upper_bound AS VARCHAR), ''))
'target price' AS [source],
tp.price AS [target_price],
FLOOR(q.vol / NULLIF(q.pltq, 0)) AS [calculated_pallets],
CAST(ROUND(q.vol / NULLIF(q.pltq, 0), 5) AS NUMERIC(20,5)) AS [exact_pallets],
CONCAT(tp.lower_bound, '-', ISNULL(CAST(tp.upper_bound AS VARCHAR), '')) AS [volume_range],
q.cust AS [customer],
q.chan AS [channel],
TRIM(q.tier) AS [tier],
JSON_QUERY(tp.math) AS [target_math]
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER
),
volume_range = CONCAT(tp.lower_bound, '-', ISNULL(CAST(tp.upper_bound AS VARCHAR), ''))
FROM @queue q FROM @queue q
INNER JOIN pricing.target_prices tp ON INNER JOIN pricing.target_prices tp ON
q.stlc = tp.stlc q.stlc = tp.stlc
@ -122,42 +114,52 @@ BEGIN
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
UPDATE q UPDATE q
SET SET
hist = JSON_MODIFY('{}', '$.full_history', JSON_QUERY(lp.part_stats)), hist = lp.part_stats
last_price = j.price,
last_date = j.odate,
last_order = j.ordnum,
last_quote = j.quoten,
expl = JSON_MODIFY(
JSON_MODIFY(
JSON_MODIFY(
JSON_MODIFY(
ISNULL(q.expl, '{}'),
'$.last_price', j.price
),
'$.last_date', CONVERT(NVARCHAR(10), j.odate, 23)
),
'$.last_order', j.ordnum
),
'$.last_quote', j.quoten
)
FROM @queue q FROM @queue q
JOIN pricing.lastprice lp JOIN pricing.lastpricedetail lp
ON lp.customer = q.cust ON lp.customer = q.cust AND lp.partgroup = q.partgroup;
AND lp.mold = SUBSTRING(q.part, 1, 8)
OUTER APPLY ( --------------------------------------------------------------------------------
SELECT TOP 1 * -- Step 4b.1: Populate composite fields from precedence chain using JSON-based helper
FROM OPENJSON(lp.part_stats) AS p --------------------------------------------------------------------------------
OUTER APPLY OPENJSON(p.value) -- Use new helper to select best last price, source, and date directly from JSON
WITH ( UPDATE q
qty NUMERIC(20,5), SET
price NUMERIC(20,5), last_price = b.price,
odate DATE, last_source = b.source,
ordnum INT, last_date = b.odate,
quoten INT last_qty = b.qty,
) AS j last_dataseg = b.dataseg,
WHERE p.[key] COLLATE SQL_Latin1_General_CP1_CI_AS = q.part last_order = b.ord,
ORDER BY j.odate DESC last_quote = b.quote
) AS j; FROM @queue q
CROSS APPLY (
SELECT TOP 1 price, source, odate, qty, dataseg, ord, quote
FROM pricing.pick_last_price_from_hist_json(q.hist, q.v1ds)
) b;
--------------------------------------------------------------------------------
-- Step 4b.2: Build JSON explanation object from populated columns
--------------------------------------------------------------------------------
UPDATE q
SET expl = (
SELECT
q.last_price AS last_price,
q.last_qty AS last_qty,
q.last_dataseg AS last_dataseg,
q.last_source AS last_source,
FORMAT(q.last_date, 'yyyy-MM-dd') AS last_date,
q.tprice AS [target_price],
JSON_QUERY(q.tmath) AS [target_math],
FLOOR(q.vol / NULLIF(q.pltq, 0)) AS [calculated_pallets],
CAST(ROUND(q.vol / NULLIF(q.pltq, 0), 5) AS NUMERIC(20,5)) AS [exact_pallets],
q.cust AS [customer],
q.chan AS [channel],
TRIM(q.tier) AS [tier]
-- JSON_QUERY(hist) AS [history]
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER
)
FROM @queue q;
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- Step 5: Add list price info from external pricelist -- Step 5: Add list price info from external pricelist
@ -222,7 +224,7 @@ BEGIN
CAST(JSON_VALUE(q.expl, '$.target_price') AS NUMERIC(20,5)), CAST(JSON_VALUE(q.expl, '$.target_price') AS NUMERIC(20,5)),
CAST(JSON_VALUE(q.expl, '$.last_price') AS NUMERIC(20,5)), CAST(JSON_VALUE(q.expl, '$.last_price') AS NUMERIC(20,5)),
CAST(JSON_VALUE(q.expl, '$.list_price') AS NUMERIC(20,5)), CAST(JSON_VALUE(q.expl, '$.list_price') AS NUMERIC(20,5)),
CAST(JSON_VALUE(q.expl, '$.last_date') AS DATE) CAST(last_date AS DATE)
) g; ) g;
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -230,6 +232,8 @@ BEGIN
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
UPDATE q UPDATE q
SET ui_json = ( SET ui_json = (
SELECT
(
SELECT SELECT
panel.label, panel.label,
JSON_QUERY(panel.details) AS details JSON_QUERY(panel.details) AS details
@ -239,11 +243,18 @@ BEGIN
'History' AS label, 'History' AS label,
( (
SELECT SELECT
'Last Sale: ' + CAST(q.last_date AS varchar(10)) AS label, 'Last Price' AS label,
q.last_price AS value, q.last_price AS value,
'currency' AS type, 'currency' AS type,
'Ord# ' + q.last_order AS note CONCAT(
FOR JSON PATH 'Source: ', ISNULL(q.last_source, 'N/A'),
' | Date: ', ISNULL(CONVERT(varchar(10), q.last_date, 120), 'N/A'),
' | Order: ', ISNULL(q.last_order, 'N/A'),
' | Quote: ', ISNULL(q.last_quote, 'N/A'),
' | Dataseg: ', ISNULL(q.last_dataseg, 'N/A'),
' | Qty: ', ISNULL(CAST(q.last_qty AS varchar(32)), 'N/A')
) AS note
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER
) AS details ) AS details
UNION ALL UNION ALL
@ -267,11 +278,11 @@ BEGIN
'Target Support' AS label, 'Target Support' AS label,
( (
SELECT SELECT
-- parse each item in target_math RTRIM(SUBSTRING(value,1,18)) AS label,
RTRIM(SUBSTRING(value,1,18)) label, TRY_CAST(SUBSTRING(value,23,7) AS NUMERIC(20,5))
TRY_CAST(SUBSTRING(value,23,7) AS NUMERIC(20,5)) + CASE SUBSTRING(value,19,1) WHEN '+' THEN 0 ELSE -1 END AS value, + CASE SUBSTRING(value,19,1) WHEN '+' THEN 0 ELSE -1 END AS value,
CASE SUBSTRING(value,19,1) WHEN '+' THEN 'currency' ELSE 'percentage' END AS type, CASE SUBSTRING(value,19,1) WHEN '+' THEN 'currency' ELSE 'percentage' END AS type,
SUBSTRING(value,19,1) AS note CASE SUBSTRING(value,19,1) WHEN '+' THEN 'Price' ELSE 'Premium' END AS note
FROM OPENJSON(q.expl, '$.target_math') FROM OPENJSON(q.expl, '$.target_math')
WITH (value NVARCHAR(MAX) '$') WITH (value NVARCHAR(MAX) '$')
FOR JSON PATH FOR JSON PATH
@ -284,23 +295,19 @@ BEGIN
'Guidance' AS label, 'Guidance' AS label,
( (
SELECT SELECT
'Last Price Capped' AS label, 'Price' AS label,
q.guidance_price AS value, q.guidance_price AS value,
'currency' AS type, 'currency' AS type,
CONCAT( q.guidance_reason AS note
'Last price ', q.last_price,
' capped at ',
ROUND((q.last_price - q.guidance_price) / NULLIF(q.last_price, 0) * 100, 2),
'%'
) AS note
FOR JSON PATH FOR JSON PATH
) )
) AS panel ) AS panel
FOR JSON PATH, ROOT('details') FOR JSON PATH
) AS details,
JSON_QUERY(q.expl) AS data -- 👈 adds the full expl content as a JSON object
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER -- 👈 make it a single JSON object
) )
FROM @queue q; FROM @queue q;
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- Final: Return the enriched result row -- Final: Return the enriched result row
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------