Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-06-23 20:47:52 +03:00
parent 136c1e74fb
commit 057f52a1f9
2 changed files with 34 additions and 26 deletions

View File

@@ -361,11 +361,11 @@ LIMIT 1
row.MmitemID = mmitemByCode[row.ProductCode]
row.Dim1ID = dim1ByToken[row.ColorCode]
if row.Dim3Code != "" {
// dimval3 tokens can be ambiguous globally; prefer per-mmitem inference.
if inferred := inferDim3ForMmitem(row.MmitemID, row.Dim3Code); inferred > 0 {
// dimval3 can be ambiguous, but if mk_dim_token_map has a row we treat it as source of truth.
if v := dim3ByToken[row.Dim3Code]; v > 0 {
row.Dim3ID = v
} else if inferred := inferDim3ForMmitem(row.MmitemID, row.Dim3Code); inferred > 0 {
row.Dim3ID = inferred
} else {
row.Dim3ID = dim3ByToken[row.Dim3Code]
}
}
row.MappingReady = row.MmitemID > 0 && row.Dim1ID > 0 && (row.Dim3Code == "" || row.Dim3ID > 0)