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-04-15 16:43:21 +03:00
parent 5be7315bdb
commit 1a80184cac
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -541,6 +541,14 @@ export const useOrderEntryStore = defineStore('orderentry', {
const s = String(d).split('T')[0] const s = String(d).split('T')[0]
return s return s
} }
const getLineDueDate = (ln) => (
formatDate(
ln?.DueDate ||
ln?.DeliveryDate ||
ln?.PlannedDateOfLading ||
''
)
)
const oldDate = formatDate(this.originalHeader?.AverageDueDate) const oldDate = formatDate(this.originalHeader?.AverageDueDate)
const newDate = formatDate(this.header?.AverageDueDate) const newDate = formatDate(this.header?.AverageDueDate)
@@ -556,7 +564,7 @@ export const useOrderEntryStore = defineStore('orderentry', {
const seen = new Set() const seen = new Set()
normalized.forEach(ln => { normalized.forEach(ln => {
if (ln?._deleteSignal || !ln?.OrderLineID || ln?._dirty !== true) return if (ln?._deleteSignal || !ln?.OrderLineID) return
const orig = origMap.get(String(ln.OrderLineID)) const orig = origMap.get(String(ln.OrderLineID))
if (!orig) return if (!orig) return
@@ -564,8 +572,8 @@ export const useOrderEntryStore = defineStore('orderentry', {
const itemCode = String(ln?.ItemCode || '').trim().toUpperCase() const itemCode = String(ln?.ItemCode || '').trim().toUpperCase()
const colorCode = String(ln?.ColorCode || '').trim().toUpperCase() const colorCode = String(ln?.ColorCode || '').trim().toUpperCase()
const itemDim2Code = String(ln?.ItemDim2Code || '').trim().toUpperCase() const itemDim2Code = String(ln?.ItemDim2Code || '').trim().toUpperCase()
const oldLnDate = formatDate(orig?.DueDate) const oldLnDate = getLineDueDate(orig)
const newLnDate = formatDate(ln?.DueDate) const newLnDate = getLineDueDate(ln)
if (!itemCode || !newLnDate || oldLnDate === newLnDate) return if (!itemCode || !newLnDate || oldLnDate === newLnDate) return
const key = [itemCode, colorCode, itemDim2Code, oldLnDate, newLnDate].join('||') const key = [itemCode, colorCode, itemDim2Code, oldLnDate, newLnDate].join('||')
@@ -613,8 +621,8 @@ export const useOrderEntryStore = defineStore('orderentry', {
let label = mapLabel(ln) let label = mapLabel(ln)
const orig = origMap.get(String(ln.OrderLineID)) const orig = origMap.get(String(ln.OrderLineID))
if (orig) { if (orig) {
const oldLnDate = formatDate(orig.DueDate) const oldLnDate = getLineDueDate(orig)
const newLnDate = formatDate(ln.DueDate) const newLnDate = getLineDueDate(ln)
if (newLnDate && oldLnDate !== newLnDate) { if (newLnDate && oldLnDate !== newLnDate) {
label += ` (Termin: ${oldLnDate} -> ${newLnDate})` label += ` (Termin: ${oldLnDate} -> ${newLnDate})`
} }