diff --git a/inventory-web/src/views/outbound/create.vue b/inventory-web/src/views/outbound/create.vue index 4f91821..ba3d69e 100644 --- a/inventory-web/src/views/outbound/create.vue +++ b/inventory-web/src/views/outbound/create.vue @@ -498,23 +498,35 @@ const scanTotalTypes = computed(() => plannedItems.value.length) // ★ 未扫清单:计划中还没扫满的物料 const unscannedList = computed(() => { - return plannedItems.value.map(plan => { - const planQty = Number(plan.quantity) || 0 - // 已扫数量(按名称+规格匹配) - const scannedQty = cartItems.value - .filter(ci => { - const ciName = (ci.name || '').trim() - const ciSpec = (ci.spec_model || ci.standard || '').trim() - return ciName === (plan.name || '').trim() && - ciSpec === (plan.spec_model || '').trim() - }) - .reduce((sum, ci) => sum + (Number(ci.out_quantity) || 0), 0) + // ★ 先按「名称+规格」把计划行**合并**再比较。 + // 序列号物料是一物一行(每行 quantity=1),若逐行比较,同一笔扫码会让 + // 每一行都算作"已满足"(planQty 1 - scannedQty 1 = 0),于是扫了 1 个 + // 就把整个物料判为扫完,未扫清单漏报。 + const planGroups = new Map() + for (const plan of plannedItems.value) { + const name = (plan.name || '').trim() + const spec = (plan.spec_model || '').trim() + const key = `${name}|${spec}` + const g = planGroups.get(key) || { name, spec, planQty: 0 } + g.planQty += Number(plan.quantity) || 0 + planGroups.set(key, g) + } + + // 已扫数量同样按「名称+规格」汇总 + const scannedByKey = new Map() + for (const ci of cartItems.value) { + const key = `${(ci.name || '').trim()}|${(ci.spec_model || ci.standard || '').trim()}` + scannedByKey.set(key, (scannedByKey.get(key) || 0) + (Number(ci.out_quantity) || 0)) + } + + return Array.from(planGroups.entries()).map(([key, g]) => { + const scannedQty = scannedByKey.get(key) || 0 return { - name: plan.name || '', - spec: plan.spec_model || '', - planQty, + name: g.name, + spec: g.spec, + planQty: g.planQty, scannedQty, - remaining: Math.max(0, planQty - scannedQty) + remaining: Math.max(0, g.planQty - scannedQty) } }).filter(item => item.remaining > 0) // 只保留未扫满的 }) @@ -751,17 +763,21 @@ const validateAgainstPlan = (scannedName: string, scannedSpec: string, scannedQt const normalizedName = scannedName.trim() const normalizedSpec = (scannedSpec || '').trim() - const matchedPlan = plannedItems.value.find(plan => { + // ★ 计划侧必须**汇总所有匹配行**,不能只取第一行。 + // 序列号物料在申请单里是「一物一行、每行 quantity=1」,用 .find() 只拿到 1, + // 而下面的已扫侧是 .reduce() 求总和 —— 两边聚合口径不一致, + // 扫到第 2 个就会误报「超出计划数量(计划: 1,已扫: 1,本次: 1)」。 + const matchedPlans = plannedItems.value.filter((plan: any) => { const planName = (plan.name || '').trim() const planSpec = (plan.spec_model || '').trim() return planName === normalizedName && planSpec === normalizedSpec }) - if (!matchedPlan) { + if (!matchedPlans.length) { return `该物料【${normalizedName} × ${normalizedSpec}】不在计划清单中,请检查` } - const planQty = matchedPlan.quantity ?? 0 + const planQty = matchedPlans.reduce((sum: number, plan: any) => sum + (Number(plan.quantity) || 0), 0) // 已扫数量(去重合并) const alreadyScanned = cartItems.value