Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-04-02 13:36:09 +03:00
parent f5c91abafa
commit 4549152594
15 changed files with 318 additions and 626 deletions

View File

@@ -182,7 +182,15 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
this.cdItemLookups = res?.data || null
return this.cdItemLookups
} catch (err) {
this.error = err?.response?.data || err?.message || 'cdItem lookup listesi alinamadi'
const rid =
err?.response?.headers?.['x-debug-request-id'] ||
err?.response?.data?.requestId ||
''
logApiError('fetchCdItemLookups', err, { force, requestId: rid })
if (rid) {
console.error(`[OrderProductionItemStore] fetchCdItemLookups requestId=${rid}`)
}
this.error = extractApiErrorMessage(err, 'cdItem lookup listesi alinamadi')
return null
}
},

View File

@@ -1899,7 +1899,7 @@ export const useOrderEntryStore = defineStore('orderentry', {
const girilen = Number(form.fiyat || 0)
if (minFiyat > 0 && girilen < minFiyat && $q) {
if (minFiyat > 0 && girilen > 0 && girilen < minFiyat && $q) {
fiyatOK = await new Promise(resolve => {
$q.dialog({
title: 'Fiyat Uyarısı',
@@ -3644,16 +3644,7 @@ export const useOrderEntryStore = defineStore('orderentry', {
continue
}
// AKSBIR / bedensiz satırda kaynak adet bazen `row.adet`te tutuluyor.
// Bu fallback yoksa ItemDim1Code='' satırı Qty1=0 düşebiliyor.
const qty = toNum(
row.qty ??
row.Qty1 ??
row.miktar ??
row.adet ??
row.Adet ??
0
)
const qty = toNum(row.qty ?? row.Qty1 ?? row.miktar ?? 0)
// ✅ ComboKey stabil: bedenKey = '_'
const bedenKey = '_'