1

src/modules/first-leg/utils/firstLegOrder.test.mjs

@@ -162,10 +162,11 @@ test('requires public destination ids while keeping private addresses detached f
 test('requires customs inspection when any cargo is a wooden product', () => {
   const draft = validDraft()
   draft.items[0].woodenProduct = true
+  draft.items.push({ ...draft.items[0], id: 'cargo-2' })
   draft.customsInspection = null
-  assert.ok(validateFirstLegOrderDraft(draft).includes('第 1 条货物为木制品，“是否商检”必须选择“是”'))
+  assert.ok(validateFirstLegOrderDraft(draft).includes('第 1、2 条货物为木制品，“是否商检”必须选择“是”'))
   draft.customsInspection = false
-  assert.ok(validateFirstLegOrderDraft(draft).includes('第 1 条货物为木制品，“是否商检”必须选择“是”'))
+  assert.ok(validateFirstLegOrderDraft(draft).includes('第 1、2 条货物为木制品，“是否商检”必须选择“是”'))
   draft.customsInspection = true
   assert.ok(!validateFirstLegOrderDraft(draft).some((message) => message.includes('为木制品')))
 })

src/modules/first-leg/utils/firstLegOrder.ts

@@ -141,9 +141,15 @@ export function validateFirstLegOrderDraft(draft: FirstLegOrderDraft) {
     }
     if (item.grossWeightKg <= 0) errors.push(`${line}毛重必须大于 0`)
     if (item.volumeCbm <= 0) errors.push(`${line}体积必须大于 0`)
-    if (item.woodenProduct && draft.customsInspection !== true) errors.push(`${line}为木制品，“是否商检”必须选择“是”`)
   })
 
+  const woodenCargoLines = draft.items
+    .map((item, index) => item.woodenProduct ? index + 1 : null)
+    .filter((index): index is number => index != null)
+  if (woodenCargoLines.length && draft.customsInspection !== true) {
+    errors.push(`第 ${woodenCargoLines.join('、')} 条货物为木制品，“是否商检”必须选择“是”`)
+  }
+
   if (draft.fulfillmentType === 'ONE_CLICK_DROPSHIP') {
     const groups = new Map<string, FirstLegCargoItem>()
     draft.items.forEach((item) => {