fix: 统一计划产品计量单位并兼容历史吨单位，避免保存时关联校验失败。

web-admin/src/utils/crm-product-display.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest'
+import {
+  DEFAULT_PRODUCT_UNIT_VALUE,
+  normalizeProductUnitValue
+} from './crm-product-display'
+
+describe('normalizeProductUnitValue', () => {
+  it('defaults empty unit to dict value dun', () => {
+    expect(normalizeProductUnitValue('')).toBe(DEFAULT_PRODUCT_UNIT_VALUE)
+    expect(normalizeProductUnitValue(null)).toBe('dun')
+    expect(normalizeProductUnitValue(undefined)).toBe('dun')
+  })
+
+  it('maps historical Chinese labels to dict values', () => {
+    expect(normalizeProductUnitValue('吨')).toBe('dun')
+    expect(normalizeProductUnitValue('千克')).toBe('kg')
+  })
+
+  it('keeps existing dict values', () => {
+    expect(normalizeProductUnitValue('dun')).toBe('dun')
+    expect(normalizeProductUnitValue('kg')).toBe('kg')
+  })
+})

web-admin/src/utils/crm-product-display.ts

@@ -70,6 +70,33 @@ export function getProductUnitLabel(
 /** CRM 计量单位「吨」的字典值及历史直存文案 */
 export const TON_PRODUCT_UNIT_VALUES = new Set(['dun', '吨'])
 
+/** 计划/合同提交用的默认单位（字典值，不是展示文案） */
+export const DEFAULT_PRODUCT_UNIT_VALUE = 'dun'
+
+/** 展示文案 → 字典值；避免「吨」与合同行 dun 混用导致保存校验失败 */
+const PRODUCT_UNIT_LABEL_TO_VALUE: Record<string, string> = {
+  千克: 'kg',
+  吨: 'dun',
+  升: 'sheng',
+  瓶: 'ping',
+  袋: 'dai',
+  桶: 'tong',
+  毫升: 'hs',
+  套: 'set',
+  个: 'piece',
+  台: 'unit'
+}
+
+/**
+ * 表单写入 / 提交用：统一为 crm_product_unit 字典值。
+ * 空值默认 dun；历史直存「吨」等中文标签映射为对应 value。
+ */
+export function normalizeProductUnitValue(unit: string | null | undefined): string {
+  const raw = String(unit || '').trim()
+  if (!raw) return DEFAULT_PRODUCT_UNIT_VALUE
+  return PRODUCT_UNIT_LABEL_TO_VALUE[raw] || raw
+}
+
 /** 地磅过磅单位为吨；空单位按业务默认视为吨 */
 export function isTonProductUnit(unit: string | null | undefined): boolean {
   const code = (unit || '').trim()

web-admin/src/utils/pl-plan-stop-form.ts

@@ -2,6 +2,7 @@ import type { Plan, PlanContractLink, PlanDelivery, PlanLoad, PlanStopProduct }
 import type { PlanFormProductRow } from '@/composables/usePlContractToPlan'
 import type { BrandOption } from '@/utils/crm-product-brand'
 import { formatBrandConstraintLabel } from '@/utils/crm-product-brand'
+import { normalizeProductUnitValue } from '@/utils/crm-product-display'
 import {
   isPlDibangOptionalVehiclePlate,
   isPlInternalCustomerName
@@ -193,7 +194,7 @@ export function createStopProductsFromPlanProducts(
     brandName: item.brandName,
     brandOptions: item.brandOptions ? [...item.brandOptions] : undefined,
     model: item.model,
-    unit: item.unit || '吨',
+    unit: normalizeProductUnitValue(item.unit),
     packageSpec: item.packageSpec,
     deliveryMethod: item.deliveryMethod,
     planQty: Number(item[qtyField] ?? item.quantity ?? 0),
@@ -399,7 +400,7 @@ export function enrichStopProductsDisplayFromPlan(
       brandName: match.brandName ?? row.brandName,
       brandOptions: match.brandOptions?.length ? [...match.brandOptions] : row.brandOptions,
       model: row.model || match.model,
-      unit: row.unit || match.unit || '吨',
+      unit: normalizeProductUnitValue(row.unit || match.unit),
       packageSpec: row.packageSpec || match.packageSpec,
       deliveryMethod: row.deliveryMethod || match.deliveryMethod,
       planQty,
@@ -461,7 +462,7 @@ function mapStopProductFromApi(row: PlanStopProduct): PlanStopProductFormRow {
     productNo: row.productNo,
     productName: row.productName,
     model: row.model,
-    unit: row.unit || '吨',
+    unit: normalizeProductUnitValue(row.unit),
     packageSpec: row.packageSpec,
     deliveryMethod: row.deliveryMethod,
     contractId: row.contractId,
@@ -595,7 +596,7 @@ export function mapLegacyPlanToStops(plan: Plan): {
       productNo: item.productNo || '',
       productName: item.productName || '',
       model: item.model,
-      unit: item.unit || '吨',
+      unit: normalizeProductUnitValue(item.unit),
       quantity: Number(item.quantity ?? item.actualQty ?? 0),
       packageSpec: item.packageSpec,
       deliveryMethod: item.deliveryMethod,
@@ -754,7 +755,7 @@ export function mapLoadProductsToPlanFormRows(
     brandName: row.brandName,
     brandOptions: row.brandOptions ? [...row.brandOptions] : undefined,
     model: row.model,
-    unit: row.unit || '吨',
+    unit: normalizeProductUnitValue(row.unit),
     quantity: Number(row.planQty ?? 0),
     actualQty: 0,
     packageSpec: row.packageSpec,
@@ -863,7 +864,7 @@ export function buildStopProductPayload(row: PlanStopProductFormRow) {
     productNo: row.productNo,
     productName: row.productName,
     model: row.model,
-    unit: row.unit,
+    unit: normalizeProductUnitValue(row.unit),
     packageSpec: row.packageSpec,
     deliveryMethod: row.deliveryMethod,
     contractId: row.contractId || undefined,