Merge remote-tracking branch 'origin/master'

svc/queries/wholesale_campaign_variants_mssql.go

@@ -16,6 +16,45 @@ DECLARE @Codes NVARCHAR(MAX) = @p1;
   CROSS APPLY D.XmlData.nodes('/i') AS X(C)
   WHERE LTRIM(RTRIM(X.C.value('.', 'NVARCHAR(50)'))) <> ''
 ),
+VARIANT_MASTER AS (
+  SELECT
+    V.ItemCode,
+    LTRIM(RTRIM(ISNULL(V.ColorCode,'')))     AS ColorCode,
+    LTRIM(RTRIM(ISNULL(V.ItemDim3Code,'')))  AS ItemDim3Code,
+    MAX(LTRIM(RTRIM(ISNULL(V.ItemDim1Code,'')))) AS ItemDim1Code
+  FROM prItemVariant V WITH(NOLOCK)
+  JOIN INP ON INP.ItemCode = V.ItemCode
+  WHERE V.ItemTypeCode = 1
+    AND LEN(V.ItemCode) = 13
+  GROUP BY
+    V.ItemCode, V.ColorCode, V.ItemDim3Code
+),
+VARIANT_STOCK AS (
+  SELECT
+    S.ItemCode,
+    LTRIM(RTRIM(ISNULL(S.ColorCode,'')))     AS ColorCode,
+    LTRIM(RTRIM(ISNULL(S.ItemDim3Code,'')))  AS ItemDim3Code,
+    MAX(LTRIM(RTRIM(ISNULL(S.ItemDim1Code,'')))) AS ItemDim1Code
+  FROM trStock S WITH(NOLOCK)
+  JOIN INP ON INP.ItemCode = S.ItemCode
+  WHERE S.ItemTypeCode = 1
+    AND LEN(S.ItemCode) = 13
+  GROUP BY
+    S.ItemCode, S.ColorCode, S.ItemDim3Code
+),
+VARIANT AS (
+  SELECT
+    X.ItemCode,
+    X.ColorCode,
+    X.ItemDim3Code,
+    MAX(X.ItemDim1Code) AS ItemDim1Code
+  FROM (
+    SELECT ItemCode, ColorCode, ItemDim3Code, ItemDim1Code FROM VARIANT_MASTER
+    UNION ALL
+    SELECT ItemCode, ColorCode, ItemDim3Code, ItemDim1Code FROM VARIANT_STOCK
+  ) X
+  GROUP BY X.ItemCode, X.ColorCode, X.ItemDim3Code
+),
 STOCK AS (
   SELECT
     S.ItemCode,
@@ -73,27 +112,25 @@ DISP AS (
     D.ItemCode, D.ColorCode, D.ItemDim3Code
 )
 SELECT
-  S.ItemCode     AS ItemCode,
-  S.ColorCode    AS ColorCode,
-  S.ItemDim1Code AS ItemDim1Code,
-  S.ItemDim3Code AS ItemDim3Code,
+  V.ItemCode     AS ItemCode,
+  V.ColorCode    AS ColorCode,
+  V.ItemDim1Code AS ItemDim1Code,
+  V.ItemDim3Code AS ItemDim3Code,
   CAST(ROUND(
-    S.InventoryQty1
+    ISNULL(S.InventoryQty1,0)
     - ISNULL(PK.PickingQty1,0)
     - ISNULL(RS.ReserveQty1,0)
     - ISNULL(DP.DispOrderQty1,0),
     2
   ) AS FLOAT) AS StockQty
-FROM STOCK S
+FROM VARIANT V
+LEFT JOIN STOCK S
+  ON S.ItemCode=V.ItemCode AND S.ColorCode=V.ColorCode AND S.ItemDim3Code=V.ItemDim3Code
 LEFT JOIN PICK PK
-  ON PK.ItemCode=S.ItemCode AND PK.ColorCode=S.ColorCode AND PK.ItemDim3Code=S.ItemDim3Code
+  ON PK.ItemCode=V.ItemCode AND PK.ColorCode=V.ColorCode AND PK.ItemDim3Code=V.ItemDim3Code
 LEFT JOIN RESERVE RS
-  ON RS.ItemCode=S.ItemCode AND RS.ColorCode=S.ColorCode AND RS.ItemDim3Code=S.ItemDim3Code
+  ON RS.ItemCode=V.ItemCode AND RS.ColorCode=V.ColorCode AND RS.ItemDim3Code=V.ItemDim3Code
 LEFT JOIN DISP DP
-  ON DP.ItemCode=S.ItemCode AND DP.ColorCode=S.ColorCode AND DP.ItemDim3Code=S.ItemDim3Code
-WHERE (S.InventoryQty1
-    - ISNULL(PK.PickingQty1,0)
-    - ISNULL(RS.ReserveQty1,0)
-    - ISNULL(DP.DispOrderQty1,0)) <> 0
-ORDER BY S.ItemCode, S.ColorCode, S.ItemDim3Code;
+  ON DP.ItemCode=V.ItemCode AND DP.ColorCode=V.ColorCode AND DP.ItemDim3Code=V.ItemDim3Code
+ORDER BY V.ItemCode, V.ColorCode, V.ItemDim3Code;
 `