Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -59,7 +59,7 @@ func LookupFirmaIDByKodu(ctx context.Context, uretimDB *sql.DB, firmaKodu string
|
||||
}
|
||||
sqlText := `
|
||||
SELECT TOP 1 ISNULL(F.nFirmaID, 0) AS nFirmaID
|
||||
FROM dbo.tbFirma F WITH (NOLOCK)
|
||||
FROM dbo.tbFirma F
|
||||
WHERE LTRIM(RTRIM(ISNULL(F.sKodu, ''))) = @p1
|
||||
ORDER BY F.nFirmaID
|
||||
`
|
||||
@@ -234,10 +234,10 @@ func UpsertV3ItemBasePriceUSD(
|
||||
var targetCountry string
|
||||
err := mssqlDB.QueryRowContext(ctx, `
|
||||
SELECT TOP 1 C.CountryCode
|
||||
FROM dbo.cdCountry C WITH (NOLOCK)
|
||||
FROM dbo.cdCountry C
|
||||
WHERE C.CountryCode <> 'TR'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM dbo.prItemBasePrice P WITH (NOLOCK)
|
||||
SELECT 1 FROM dbo.prItemBasePrice P
|
||||
WHERE P.ItemTypeCode = 1
|
||||
AND LTRIM(RTRIM(P.ItemCode)) = LTRIM(RTRIM(@p1))
|
||||
AND P.BasePriceCode = 1
|
||||
@@ -448,7 +448,7 @@ func GetProductionProductCostingMTBolumOptions(ctx context.Context, uretimDB *sq
|
||||
SELECT TOP (@p2)
|
||||
ISNULL(B.nUrtMTBolumID, 0) AS nUrtMTBolumID,
|
||||
ISNULL(B.sAdi, '') AS sAdi
|
||||
FROM dbo.spUrtMTBolum B WITH (NOLOCK)
|
||||
FROM dbo.spUrtMTBolum B
|
||||
WHERE ISNULL(B.bAktif, 0) = 1
|
||||
AND ISNULL(B.nUrtTipiID, 0) = 1
|
||||
AND (@p1 = '' OR ISNULL(B.sAdi, '') LIKE @p3 OR CONVERT(VARCHAR(32), ISNULL(B.nUrtMTBolumID, 0)) LIKE @p3)
|
||||
@@ -477,15 +477,15 @@ SELECT
|
||||
CAST(CASE WHEN ISNULL(M.bAktif, 0) = 1 THEN 1 ELSE 0 END AS bit) AS bAktif,
|
||||
CONVERT(VARCHAR(16), M.dteIslemTarihi, 120) AS dteIslemTarihi,
|
||||
ISNULL(M.sKullaniciAdi, '') AS sKullaniciAdi
|
||||
FROM dbo.mk_MaliyetParcaEslestirme M WITH (NOLOCK)
|
||||
LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK)
|
||||
FROM dbo.mk_MaliyetParcaEslestirme M
|
||||
LEFT JOIN dbo.spUrtMTBolum B
|
||||
ON B.nUrtMTBolumID = M.nUrtMTBolumID
|
||||
AND ISNULL(B.nUrtTipiID, 0) = 1
|
||||
OUTER APPLY (
|
||||
SELECT
|
||||
STUFF((
|
||||
SELECT ',' + LTRIM(RTRIM(CONVERT(VARCHAR(32), X.nHammaddeTuruNo)))
|
||||
FROM dbo.mk_MaliyetParcaEslestirme_HammaddeTuru X WITH (NOLOCK)
|
||||
FROM dbo.mk_MaliyetParcaEslestirme_HammaddeTuru X
|
||||
WHERE X.mapping_id = M.id
|
||||
ORDER BY X.nHammaddeTuruNo
|
||||
FOR XML PATH(''), TYPE
|
||||
@@ -630,7 +630,7 @@ SELECT
|
||||
ISNULL(H.nHammaddeTuruNo, 0) AS nHammaddeTuruNo,
|
||||
ISNULL(H.sAciklama, '') AS sAciklama,
|
||||
ISNULL(H.MTnUrtMTBolumID, 0) AS MTnUrtMTBolumID
|
||||
FROM dbo.spUrtOnMLHammaddeTuru H WITH (NOLOCK)
|
||||
FROM dbo.spUrtOnMLHammaddeTuru H
|
||||
WHERE H.nHammaddeTuruNo IN (%s)
|
||||
`, strings.Join(ph, ","))
|
||||
|
||||
@@ -954,7 +954,7 @@ func GetProductionHasCostDetailRowsByOnMLNo(
|
||||
ON T.nHammaddeTuruNo = D.nHammaddeTuruNo
|
||||
LEFT JOIN dbo.spUrtMTBolum B
|
||||
ON B.nUrtMTBolumID = D.nUrtMTBolumID
|
||||
LEFT JOIN dbo.tbStok SX WITH (NOLOCK)
|
||||
LEFT JOIN dbo.tbStok SX
|
||||
ON (SX.IsBlocked = 0 OR SX.IsBlocked IS NULL)
|
||||
AND ISNULL(SX.sKodu,'') = ISNULL(D.sKodu,'')
|
||||
WHERE D.nOnMLNo = @p1
|
||||
@@ -1168,7 +1168,7 @@ HammaddeTekil AS (
|
||||
CASE WHEN H.MTnUrtMTBolumID = RMik.nUrtMTBolumID THEN 0 ELSE 1 END,
|
||||
H.nHammaddeTuruNo
|
||||
) HT
|
||||
LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK)
|
||||
LEFT JOIN dbo.spUrtMTBolum B
|
||||
ON B.nUrtMTBolumID = HT.MTnUrtMTBolumID
|
||||
AND ISNULL(B.nUrtTipiID, 0) = 1
|
||||
WHERE HT.nHammaddeTuruNo IS NOT NULL
|
||||
@@ -1246,8 +1246,8 @@ func GetProductionHasCostDetailHammaddeTypeOptions(
|
||||
COALESCE(NULLIF(LTRIM(RTRIM(T.sAciklama3)), ''), NULLIF(LTRIM(RTRIM(T.sAciklama2)), ''), N'TANIMSIZ') AS sAciklama3,
|
||||
ISNULL(T.MTnUrtMTBolumID, 0) AS mtUrtMTBolumID,
|
||||
ISNULL(B.sAdi, '') AS sParcaAdi
|
||||
FROM dbo.spUrtOnMLHammaddeTuru T WITH (NOLOCK)
|
||||
LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK)
|
||||
FROM dbo.spUrtOnMLHammaddeTuru T
|
||||
LEFT JOIN dbo.spUrtMTBolum B
|
||||
ON B.nUrtMTBolumID = T.MTnUrtMTBolumID
|
||||
AND ISNULL(B.nUrtTipiID, 0) = 1
|
||||
WHERE
|
||||
@@ -1320,10 +1320,10 @@ SELECT
|
||||
ISNULL(T.sAciklama, '') AS sAciklama,
|
||||
ISNULL(T.MTnUrtMTBolumID, 0) AS mtUrtMTBolumID,
|
||||
ISNULL(B.sAdi, '') AS sParcaAdi
|
||||
FROM dbo.spUrtOnMLHammaddeTuru T WITH (NOLOCK)
|
||||
FROM dbo.spUrtOnMLHammaddeTuru T
|
||||
INNER JOIN req R
|
||||
ON R.nHammaddeTuruNo = T.nHammaddeTuruNo
|
||||
LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK)
|
||||
LEFT JOIN dbo.spUrtMTBolum B
|
||||
ON B.nUrtMTBolumID = T.MTnUrtMTBolumID
|
||||
AND ISNULL(B.nUrtTipiID, 0) = 1
|
||||
WHERE ISNULL(T.bAktif, 0) = 1
|
||||
@@ -1373,8 +1373,8 @@ SELECT TOP (@p3)
|
||||
-- We intentionally don't depend on mk_MaliyetParcaEslestirme_vmiktarlar.bAktif
|
||||
-- to keep this feature robust across schema changes; only active hammadde types are listed.
|
||||
CAST(1 AS bit) AS bAktif
|
||||
FROM dbo.mk_MaliyetParcaEslestirme_vmiktarlar V WITH (NOLOCK)
|
||||
LEFT JOIN dbo.spUrtOnMLHammaddeTuru H WITH (NOLOCK)
|
||||
FROM dbo.mk_MaliyetParcaEslestirme_vmiktarlar V
|
||||
LEFT JOIN dbo.spUrtOnMLHammaddeTuru H
|
||||
ON H.nHammaddeTuruNo = V.nHammaddeTuruNo
|
||||
WHERE
|
||||
(@p1 = '' OR CONVERT(VARCHAR(32), ISNULL(V.nHammaddeTuruNo, 0)) LIKE @p2)
|
||||
@@ -1427,8 +1427,8 @@ func RefreshProductionProductCostingDefaultQty(ctx context.Context, uretimDB *sq
|
||||
D.dteIslemTarihi DESC,
|
||||
D.nOnMLDetNo DESC
|
||||
) AS rn
|
||||
FROM dbo.spUrtOnMLMasDet D WITH (NOLOCK)
|
||||
INNER JOIN dbo.spUrtOnMLMas M WITH (NOLOCK)
|
||||
FROM dbo.spUrtOnMLMasDet D
|
||||
INNER JOIN dbo.spUrtOnMLMas M
|
||||
ON M.nOnMLNo = D.nOnMLNo
|
||||
WHERE ISNULL(D.lMiktar, 0) > 0
|
||||
AND ISNULL(M.bIptal, 0) = 0
|
||||
@@ -1470,8 +1470,8 @@ func CalcProductionProductCostingDefaultQtyFromLastOnML(ctx context.Context, ure
|
||||
;WITH ranked AS (
|
||||
SELECT TOP (@p2)
|
||||
ISNULL(D.lMiktar, 0) AS lMiktar
|
||||
FROM dbo.spUrtOnMLMasDet D WITH (NOLOCK)
|
||||
INNER JOIN dbo.spUrtOnMLMas M WITH (NOLOCK)
|
||||
FROM dbo.spUrtOnMLMasDet D
|
||||
INNER JOIN dbo.spUrtOnMLMas M
|
||||
ON M.nOnMLNo = D.nOnMLNo
|
||||
WHERE D.nHammaddeTuruNo = @p1
|
||||
AND ISNULL(D.lMiktar, 0) > 0
|
||||
@@ -1535,9 +1535,9 @@ WITH req(nHammaddeTuruNo) AS (
|
||||
ISNULL(H.sAciklama, '') AS sAciklama,
|
||||
CAST(ISNULL(V.lDefaultMiktar, 0) AS FLOAT) AS lDefaultMiktar
|
||||
FROM req R
|
||||
INNER JOIN dbo.mk_MaliyetParcaEslestirme_vmiktarlar V WITH (NOLOCK)
|
||||
INNER JOIN dbo.mk_MaliyetParcaEslestirme_vmiktarlar V
|
||||
ON V.nHammaddeTuruNo = R.nHammaddeTuruNo
|
||||
INNER JOIN dbo.spUrtOnMLHammaddeTuru H WITH (NOLOCK)
|
||||
INNER JOIN dbo.spUrtOnMLHammaddeTuru H
|
||||
ON H.nHammaddeTuruNo = V.nHammaddeTuruNo
|
||||
WHERE ISNULL(H.bAktif, 0) = 1;
|
||||
`
|
||||
@@ -1653,8 +1653,8 @@ ranked AS (
|
||||
M.nOnMLNo DESC,
|
||||
D.nOnMLDetNo DESC
|
||||
) AS rn
|
||||
FROM dbo.spUrtOnMLMasDet D WITH (NOLOCK)
|
||||
INNER JOIN dbo.spUrtOnMLMas M WITH (NOLOCK)
|
||||
FROM dbo.spUrtOnMLMasDet D
|
||||
INNER JOIN dbo.spUrtOnMLMas M
|
||||
ON M.nOnMLNo = D.nOnMLNo
|
||||
INNER JOIN req R
|
||||
ON R.nHammaddeTuruNo = D.nHammaddeTuruNo
|
||||
|
||||
Reference in New Issue
Block a user