Merge remote-tracking branch 'origin/master'

ui/src/stores/orderentryStore.js

@@ -2562,8 +2562,12 @@ export const useOrderEntryStore = defineStore('orderentry', {
         }
 
         const finalStockMap = {}
-        for (const lbl of form.bedenLabels) {
-          finalStockMap[lbl] = apiStockMap[lbl] ?? 0
+        for (const lbl of (form.bedenLabels || [])) {
+          const normalizedLbl =
+            lbl == null || String(lbl).trim() === ''
+              ? ' '
+              : normalizeBedenLabel(String(lbl))
+          finalStockMap[lbl] = apiStockMap[normalizedLbl] ?? apiStockMap[lbl] ?? 0
         }
 
         stockMap.value = { ...finalStockMap }
@@ -3138,6 +3142,16 @@ export const useOrderEntryStore = defineStore('orderentry', {
         return s
       }
 
+      // UI'de yas grubu 2/4/6... gösterilir; payload'a 2Y/4Y/6... yazılır.
+      const toPayloadBeden = (grpKey, v) => {
+        const base = normBeden(v)
+        if (!base) return ''
+        if (grpKey === 'yas' && /^\d+$/.test(base)) {
+          return `${base}Y`
+        }
+        return base
+      }
+
       /* =========================
          USER META
       ========================== */
@@ -3383,16 +3397,19 @@ export const useOrderEntryStore = defineStore('orderentry', {
 
           const qty = toNum(qtyRaw)
 
-          // ✅ payload beden: '' / 'S' / 'M' ...
-          const bedenPayload = normBeden(bedenRaw)
+          // ✅ UI/combokey için kanonik beden (yas'ta 2/4/6...)
+          const bedenCanonical = normBeden(bedenRaw)
+          // ✅ payload beden: yas grubunda 2Y/4Y/6..., diğerlerinde normal
+          const bedenPayload = toPayloadBeden(grpKey, bedenRaw)
           // ✅ combokey beden: boşsa '_' ile stabil kalsın
-          const bedenKey = bedenPayload || '_'
+          const bedenKey = bedenCanonical || '_'
 
           let orderLineId = ''
           if (this.mode === 'edit') {
             // lineIdMap anahtarı sizde hangi bedenle tutuluyorsa ikisini de dene
             orderLineId =
               safeStr(lineIdMap?.[bedenKey]) ||
+              safeStr(lineIdMap?.[bedenCanonical]) ||
               safeStr(lineIdMap?.[bedenPayload]) ||
               safeStr(lineIdMap?.[' ']) ||
               (Object.keys(map).length === 1