M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-03-04 13:50:47 +03:00
parent 96d782e474
commit f40fa0ed18
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ui/src/pages/OrderEntry.vue
View File

@@ -2662,7 +2662,16 @@ async function onModelChange(modelCode) {
let bedenGrpKey = null let bedenGrpKey = null
// ✅ Hard-match (senin ana gruplarına göre genişletebilirsin) // ✅ Hard-match (senin ana gruplarına göre genişletebilirsin)
if ((ana.includes('garson') || kat.includes('garson') || kat.includes('yetiskin/garson') || ana.includes('yetiskin/garson')) && if (
(kat.includes('garson') || kat.includes('yetiskin/garson')) &&
(
ana.includes('gomlek atayaka') ||
ana.includes('gomlek ata yaka') ||
ana.includes('gomlek klasik')
)
) {
bedenGrpKey = 'yas'
} else if ((ana.includes('garson') || kat.includes('garson') || kat.includes('yetiskin/garson') || ana.includes('yetiskin/garson')) &&
(ana.includes('ayakkabı') || ana.includes('ayakkabi') || kat.includes('ayakkabı') || kat.includes('ayakkabi'))) { (ana.includes('ayakkabı') || ana.includes('ayakkabi') || kat.includes('ayakkabı') || kat.includes('ayakkabi'))) {
bedenGrpKey = 'ayk_garson' bedenGrpKey = 'ayk_garson'
} else if (ana.includes('pantolon') || kat.includes('pantolon')) { } else if (ana.includes('pantolon') || kat.includes('pantolon')) {

2
ui/src/stores/OrderProductionItemStore.js
View File

@@ -24,7 +24,7 @@ export function detectProductionBedenGroup (bedenList, urunAnaGrubu = '', urunKa
const yg = normalizeTextForMatch(yetiskinGarson) const yg = normalizeTextForMatch(yetiskinGarson)
if ((kat.includes('GARSON') || yg.includes('GARSON')) && if ((kat.includes('GARSON') || yg.includes('GARSON')) &&
(ana.includes('GOMLEK ATAYAKA') || ana.includes('GOMLEK KLASIK'))) { (ana.includes('GOMLEK ATAYAKA') || ana.includes('GOMLEK ATA YAKA') || ana.includes('GOMLEK KLASIK'))) {
return 'yas' return 'yas'
} }

14
ui/src/stores/orderentryStore.js
View File

@@ -2513,13 +2513,12 @@ export const useOrderEntryStore = defineStore('orderentry', {
// 🔸 GRUP ANAHTARI TESPİTİ // 🔸 GRUP ANAHTARI TESPİTİ
// ======================================================= // =======================================================
activeGroupKeyForRow(row) { activeGroupKeyForRow(row) {
const g = (row?.urunAnaGrubu || '').toUpperCase() return detectBedenGroup(
if (g.includes('TAKIM')) return 'tak' null,
if (g.includes('PANTOLON')) return 'pan' row?.urunAnaGrubu || '',
if (g.includes('GOMLEK')) return 'gom' row?.kategori || '',
if (g.includes('AYAKKABI')) return 'ayk' row?.YETISKIN_GARSON || row?.yetiskinGarson || ''
if (g.includes('YAS')) return 'yas' )
return 'tak'
}, },
/* ======================================================= /* =======================================================
🔹 MODE YÖNETİMİ — new / edit arası geçiş 🔹 MODE YÖNETİMİ — new / edit arası geçiş
@@ -3451,6 +3450,7 @@ export function detectBedenGroup(bedenList, urunAnaGrubu = '', urunKategori = ''
// YETISKIN/GARSON = GARSON ve URUN ANA GRUBU "GOMLEK ATA YAKA" veya "GOMLEK KLASIK" ise // YETISKIN/GARSON = GARSON ve URUN ANA GRUBU "GOMLEK ATA YAKA" veya "GOMLEK KLASIK" ise
// sonuc "yas" olmalidir. // sonuc "yas" olmalidir.
const isGarsonGomlekAnaGrubu = const isGarsonGomlekAnaGrubu =
rawAna.includes('GOMLEK ATAYAKA') ||
rawAna.includes('GOMLEK ATA YAKA') || rawAna.includes('GOMLEK ATA YAKA') ||
rawAna.includes('GOMLEK KLASIK') rawAna.includes('GOMLEK KLASIK')
const hasGarsonSignal = rawAna.includes('GARSON') || rawKat.includes('GARSON') || rawYetiskinGarson.includes('GARSON') const hasGarsonSignal = rawAna.includes('GARSON') || rawKat.includes('GARSON') || rawYetiskinGarson.includes('GARSON')