new_targets/price_queue_test.ms.sql

@@ -0,0 +1,76 @@
+DELETE FROM pricing.price_queue;
+
+INSERT INTO pricing.price_queue (bill, ship, part, stlc, v1ds, vol) SELECT 'GRIF0001','GRIF0001','XNS0T1G3G18B096','XNS0T1G3','v1:L..PLT..',9600;
+
+SELECT * FROM pricing.price_queue
+
+EXEC pricing.process_queue
+
+
+EXEC pricing.single_price_call
+    @bill = 'GRIF0001',
+    @ship = 'GRIF0001',
+    @part = 'XNS0T1G3G18B096',
+    @v1ds = 'v1:B..PLT..',
+    @vol = 9600;
+
+SELECT * FROM pricing.pick
+
+
+SELECT * FROM FAnalysis.PRICING.lastpricedetail l OUTER apply pricing.pick_last_price_from_hist_json (part_stats,'v1:B..PLT..') x WHERE customer = 'GRIFFIN' AND partgroup = 'XNS0T1G3'
+
+
+SELECT 
+	*
+FROM pricing.single_price_call_fn(
+    'GRIF0001',
+    'GRIF0001',
+    'XNS0T1G3G18B096',
+    'XNS0T1G3',
+    'v1:B..PLT..',
+    9600
+) f
+
+
+SELECT * INTO #result FROM pricing.price_queue WHERE 0=1
+
+INSERT INTO #result
+EXEC pricing.single_price_call_nowrite
+    @bill = 'GRIF0001',
+    @ship = 'JRSG0001',
+    @part = 'XNS0T1G3G18B096',
+    @stlc = 'XNS0T1G3',
+    @v1ds = 'v1:T..PLT..',
+    @vol = 19200;
+
+SELECT * FROM #RESULT
+
+
+SELECT 
+	q.qid,
+	q.qrn,
+	q.qcustomer,
+	q.part,
+	q.v1ds,
+	q.units_each,
+	q.price,
+	q.targetp,
+	q.lastsalesprice,
+	q.finalrecommendedprice,
+	q.lowerpricelimit,
+	q.upperpricelimit,
+	q.curstdus,
+	p.price guidance,
+	p.expl
+FROM 
+	rlarp.live_quotes q
+	OUTER APPLY pricing.single_price_call_fn(
+		q.billto
+		,q.shipto
+		,q.part 
+		,substring(q.part,1,8) 
+		,q.v1ds 
+		,q.units_each
+	) p
+WHERE
+	qstat LIKE 'Submitted%'

new_targets/price_queue_test.pg.sql

@@ -0,0 +1,52 @@
+
+ SELECT * FROM 
+ pricequote.single_price_call(
+                        'GRIF0001' ,
+                        'GRIF0001' ,
+                        'XNS0T1G3G18B096' ,
+                        'v1:B..PLT..',
+                        9600
+                )
+                
+	SELECT pricing FROM rlarp.osm_stack l WHERE l.customer ='CROS-B-CREST FARM' AND partgroup = 'STG04250'
+	
+	SELECT * FROM pricequote.lastpricedetail l LEFT JOIN lateral pricequote.pick_last_price_from_hist (part_stats,'v1:B..PLT..') x ON TRUE  WHERE customer = 'GRIFFIN' AND partgroup = 'XNS0T1G3'
+	
+	CALL pricequote.process_queue()	
+	
+	REFRESH MATERIALIZED VIEW rlarp.osm_stack_pretty;
+                
+                
+SELECT 
+	q.qid,
+	q.qrn,
+--	q.qcustomer,
+	q.partbuilt,
+	i.pricegroup,
+	q.v1ds,
+	q.units_each,
+	q.targetp,
+	q.lastsalesprice,
+--	q.finalrecommendedprice,
+--	q.lowerpricelimit,
+--	q.upperpricelimit,
+	q.curstdus,
+	q.price,
+	p.guidance_price guidance,
+	p.expl
+FROM 
+	pricequote.live_quotes q
+	LEFT OUTER JOIN "CMS.CUSLG".itemm i ON 
+		i.item = q.part
+	LEFT JOIN LATERAL pricequote.single_price_call(
+		q.billto
+		,q.shipto
+		,q.part 
+		,q.v1ds 
+		,q.units_each
+	) p ON TRUE
+WHERE
+--	qstat LIKE 'Submitted%'
+	qid = 111832 --AND q.qrn = 1
+ORDER BY 
+	qrn ASC

new_targets/procs/single_price_call_func.ms.sql

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