Merge remote-tracking branch 'origin/master'

ui/src/stores/OrderProductionItemStore.js

@@ -6,12 +6,16 @@ function extractApiErrorMessage (err, fallback) {
   const data = err?.response?.data
   if (typeof data === 'string' && data.trim()) return data
   if (data && typeof data === 'object') {
+    const validationMessages = Array.isArray(data.barcodeValidations)
+      ? data.barcodeValidations.map(v => String(v?.message || '').trim()).filter(Boolean)
+      : []
     const msg = String(data.message || '').trim()
     const step = String(data.step || '').trim()
     const detail = String(data.detail || '').trim()
     const parts = [msg]
     if (step) parts.push(`step=${step}`)
     if (detail) parts.push(detail)
+    if (validationMessages.length) parts.push(validationMessages.join(' | '))
     const merged = parts.filter(Boolean).join(' | ')
     if (merged) return merged
   }
@@ -36,6 +40,51 @@ function nowMs () {
   return Date.now()
 }
 
+const YAS_NUMERIC_SIZES = new Set(['2', '4', '6', '8', '10', '12', '14'])
+
+function safeStr (value) {
+  return value == null ? '' : String(value).trim()
+}
+
+function normalizeProductionDim1Label (value) {
+  let text = safeStr(value)
+  if (!text) return ''
+
+  text = text.toUpperCase()
+  const yasMatch = text.match(/^(\d+)\s*(Y|YAS|YAŞ)$/)
+  if (yasMatch?.[1] && YAS_NUMERIC_SIZES.has(yasMatch[1])) {
+    return yasMatch[1]
+  }
+
+  return text
+}
+
+function pickPreferredProductionYasPayloadLabel (currentRaw, nextRaw) {
+  const current = safeStr(currentRaw).toUpperCase()
+  const next = safeStr(nextRaw).toUpperCase()
+  if (!next) return current
+  if (!current) return next
+
+  const currentHasYas = /YAS$|YAŞ$/.test(current)
+  const nextHasYas = /YAS$|YAŞ$/.test(next)
+  if (!currentHasYas && nextHasYas) return next
+  return current
+}
+
+function toProductionPayloadDim1 (row, value) {
+  const base = normalizeProductionDim1Label(value)
+  if (!base) return ''
+  if (!YAS_NUMERIC_SIZES.has(base)) return base
+
+  const map =
+    row?.yasPayloadMap && typeof row.yasPayloadMap === 'object'
+      ? row.yasPayloadMap
+      : {}
+  const mapped = safeStr(map[base]).toUpperCase()
+  if (mapped) return mapped
+  return `${base}Y`
+}
+
 export const useOrderProductionItemStore = defineStore('orderproductionitems', {
   state: () => ({
     items: [],
@@ -54,6 +103,7 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
     cdItemLookups: null,
     cdItemDraftsByCode: {},
     productAttributeDraftsByCode: {},
+    knownExistingItemCodes: {},
     loading: false,
     saving: false,
     error: null
@@ -71,18 +121,35 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
   },
 
   actions: {
+    normalizeDim1ForUi (value) {
+      return normalizeProductionDim1Label(value)
+    },
+    pickPreferredYasPayloadLabel (currentRaw, nextRaw) {
+      return pickPreferredProductionYasPayloadLabel(currentRaw, nextRaw)
+    },
+    toPayloadDim1Code (row, value) {
+      return toProductionPayloadDim1(row, value)
+    },
     classifyItemCode (value) {
       const normalized = String(value || '').trim().toUpperCase()
       if (!normalized) {
         return { normalized: '', mode: 'empty', exists: false }
       }
-      const exists = this.productCodeSet.has(normalized)
+      const exists = this.productCodeSet.has(normalized) || !!this.knownExistingItemCodes[normalized]
       return {
         normalized,
         mode: exists ? 'existing' : 'new',
         exists
       }
     },
+    markItemCodeKnownExisting (itemCode, exists = true) {
+      const code = String(itemCode || '').trim().toUpperCase()
+      if (!code) return
+      this.knownExistingItemCodes = {
+        ...this.knownExistingItemCodes,
+        [code]: !!exists
+      }
+    },
 
     async fetchHeader (orderHeaderID) {
       if (!orderHeaderID) {
@@ -134,6 +201,20 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
         this.error = err?.response?.data || err?.message || 'Urun listesi alinamadi'
       }
     },
+    async fetchCdItemByCode (code) {
+      if (!code) return null
+      try {
+        const res = await api.get('/product-cditem', { params: { code } })
+        const data = res?.data || null
+        if (data) {
+          this.markItemCodeKnownExisting(code, true)
+        }
+        return data
+      } catch (err) {
+        console.error('[OrderProductionItemStore] fetchCdItemByCode failed', err)
+        return null
+      }
+    },
     async fetchColors (productCode) {
       const code = String(productCode || '').trim()
       if (!code) return []
@@ -152,6 +233,7 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
           const res = await api.get('/product-colors', { params: { code } })
           const data = res?.data
           const list = Array.isArray(data) ? data : []
+          if (list.length) this.markItemCodeKnownExisting(code, true)
           this.colorOptionsByCode[code] = list
           console.info('[OrderProductionItemStore] fetchColors done', { code, count: list.length, durationMs: Math.round(nowMs() - t0) })
           return list
@@ -284,6 +366,7 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
       try {
         const res = await api.get('/product-item-attributes', { params: { itemTypeCode: itc, itemCode: code } })
         const list = Array.isArray(res?.data) ? res.data : []
+        if (list.length) this.markItemCodeKnownExisting(code, true)
         this.productItemAttributesByKey[key] = list
         return list
       } catch (err) {
@@ -359,6 +442,7 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
           orderHeaderID,
           lineCount: lines?.length || 0,
           missingCount: Number(data?.missingCount || 0),
+          barcodeValidationCount: Number(data?.barcodeValidationCount || 0),
           requestId: rid,
           durationMs: Math.round(nowMs() - t0)
         })
@@ -371,7 +455,7 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
         this.saving = false
       }
     },
-    async applyUpdates (orderHeaderID, lines, insertMissing, cdItems = [], productAttributes = []) {
+    async applyUpdates (orderHeaderID, lines, insertMissing, cdItems = [], productAttributes = [], headerAverageDueDate = null) {
       if (!orderHeaderID) return { updated: 0, inserted: 0 }
 
       this.saving = true
@@ -384,11 +468,18 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
           lineCount: lines?.length || 0,
           insertMissing: !!insertMissing,
           cdItemCount: cdItems?.length || 0,
-          attributeCount: productAttributes?.length || 0
+          attributeCount: productAttributes?.length || 0,
+          headerAverageDueDate
         })
         const res = await api.post(
           `/orders/production-items/${encodeURIComponent(orderHeaderID)}/apply`,
-          { lines, insertMissing, cdItems, productAttributes }
+          {
+            lines,
+            insertMissing,
+            cdItems,
+            productAttributes,
+            HeaderAverageDueDate: headerAverageDueDate
+          }
         )
         const data = res?.data || { updated: 0, inserted: 0 }
         const rid = res?.headers?.['x-debug-request-id'] || ''
@@ -396,7 +487,9 @@ export const useOrderProductionItemStore = defineStore('orderproductionitems', {
           orderHeaderID,
           updated: Number(data?.updated || 0),
           inserted: Number(data?.inserted || 0),
+          barcodeInserted: Number(data?.barcodeInserted || 0),
           attributeUpserted: Number(data?.attributeUpserted || 0),
+          headerUpdated: !!data?.headerUpdated,
           requestId: rid,
           durationMs: Math.round(nowMs() - t0)
         })