Merge remote-tracking branch 'origin/master'

svc/models/orderproductionitem.go

@@ -17,6 +17,9 @@ type OrderProductionItem struct {
 	OldDim2             string  `json:"OldDim2"`
 	OldDesc             string  `json:"OldDesc"`
 	OldQty              float64 `json:"OldQty"`
+	OldDocCurrencyCode  string  `json:"OldDocCurrencyCode"`
+	OldNetAmount        float64 `json:"OldNetAmount"`
+	OldNetAmountUSD     float64 `json:"OldNetAmountUSD"`
 
 	NewItemCode string `json:"NewItemCode"`
 	NewColor    string `json:"NewColor"`

svc/queries/orderproduction_items.go

@@ -36,6 +36,26 @@ SELECT
     ISNULL(l.LineDescription,'') AS OldDesc,
     CAST(ISNULL(l.Qty1, 0) AS FLOAT) AS OldQty,
 
+    ISNULL(h.DocCurrencyCode,'TRY') AS OldDocCurrencyCode,
+    CAST(ISNULL(c.NetAmount, 0) AS FLOAT) AS OldNetAmount,
+    CAST(
+        CASE
+            WHEN ISNULL(h.DocCurrencyCode,'TRY') = 'USD'
+                THEN ISNULL(c.NetAmount,0)
+
+            WHEN ISNULL(h.DocCurrencyCode,'TRY') = 'TRY'
+                 AND usd.Rate > 0
+                THEN ISNULL(c.NetAmount,0) / usd.Rate
+
+            WHEN ISNULL(h.DocCurrencyCode,'TRY') IN ('EUR','GBP')
+                 AND cur.Rate > 0
+                 AND usd.Rate > 0
+                THEN (ISNULL(c.NetAmount,0) * cur.Rate) / usd.Rate
+
+            ELSE 0
+        END
+    AS FLOAT) AS OldNetAmountUSD,
+
     CAST('' AS NVARCHAR(60))   AS NewItemCode,
     CAST('' AS NVARCHAR(30))   AS NewColor,
     CAST('' AS NVARCHAR(30))   AS NewDim2,
@@ -46,6 +66,33 @@ SELECT
 
     CAST(0 AS bit) AS IsVariantMissing
 FROM dbo.trOrderLine l
+JOIN dbo.trOrderHeader h
+  ON h.OrderHeaderID = l.OrderHeaderID
+LEFT JOIN dbo.trOrderLineCurrency c WITH (NOLOCK)
+  ON c.OrderLineID  = l.OrderLineID
+ AND c.CurrencyCode = ISNULL(h.DocCurrencyCode,'TRY')
+
+OUTER APPLY (
+    SELECT TOP 1 Rate
+    FROM dbo.AllExchangeRates
+    WHERE CurrencyCode = 'USD'
+      AND RelationCurrencyCode = 'TRY'
+      AND ExchangeTypeCode = 6
+      AND Rate > 0
+      AND Date <= CAST(GETDATE() AS date)
+    ORDER BY Date DESC
+) usd
+
+OUTER APPLY (
+    SELECT TOP 1 Rate
+    FROM dbo.AllExchangeRates
+    WHERE CurrencyCode = ISNULL(h.DocCurrencyCode,'TRY')
+      AND RelationCurrencyCode = 'TRY'
+      AND ExchangeTypeCode = 6
+      AND Rate > 0
+      AND Date <= CAST(GETDATE() AS date)
+    ORDER BY Date DESC
+) cur
 WHERE l.OrderHeaderID = @p1
   AND ISNULL(l.ItemCode,'') LIKE 'U%'
 ORDER BY l.SortOrder, l.OrderLineID

svc/routes/orderproductionitems.go

@@ -62,6 +62,9 @@ func OrderProductionItemsRoute(mssql *sql.DB) http.Handler {
 				&o.OldDim2,
 				&o.OldDesc,
 				&o.OldQty,
+				&o.OldDocCurrencyCode,
+				&o.OldNetAmount,
+				&o.OldNetAmountUSD,
 				&o.NewItemCode,
 				&o.NewColor,
 				&o.NewDim2,