优化

src/modules/ocean-bookings/containerRequirements.ts

@@ -1,23 +1,20 @@
-import type { OceanBookingContainerInput } from './types'
+import type { OceanBookingContainerRequirement } from './types'
 import { applyContainerSpecification, containerSpecification } from '@/shared/domain/containerSpecifications'
 
-export function createBlankBookingContainer(): OceanBookingContainerInput {
-  return { containerNo: '', containerType: '40HC', containerKind: 'FCL', capacityCbm: 76, maxWeightKg: 28000 }
+export function createBlankContainerRequirement(): OceanBookingContainerRequirement {
+  return { containerType: '40HC', containerKind: 'FCL', quantity: 1, capacityCbm: 76, maxWeightKg: 28000 }
 }
 
-export function selectBookingContainerType(container: OceanBookingContainerInput, containerType: string) {
-  applyContainerSpecification(container, containerType)
+export function selectContainerRequirementType(requirement: OceanBookingContainerRequirement, containerType: string) {
+  applyContainerSpecification(requirement, containerType)
 }
 
-export function bookingContainerError(containers: OceanBookingContainerInput[]) {
-  if (!containers.length) return '请至少登记一个真实柜'
-  if (containers.length > 20) return '单次订舱最多登记 20 个真实柜'
-  const normalizedNumbers = containers.map((item) => item.containerNo.trim().toUpperCase())
-  const missingNumberIndex = normalizedNumbers.findIndex((value) => !value)
-  if (missingNumberIndex >= 0) return `第 ${missingNumberIndex + 1} 个真实柜尚未填写集装箱号`
-  const duplicateNumber = normalizedNumbers.find((value, index) => normalizedNumbers.indexOf(value) !== index)
-  if (duplicateNumber) return `集装箱号 ${duplicateNumber} 在本次订舱中重复`
-  const invalid = containers.find((item) => {
+export function containerRequirementError(requirements: OceanBookingContainerRequirement[]) {
+  if (!requirements.length) return '请至少保留一项柜型需求'
+  if (requirements.length > 20) return '单次订舱最多登记 20 项柜型需求'
+  const invalidQuantityIndex = requirements.findIndex((item) => !Number.isInteger(Number(item.quantity)) || Number(item.quantity) < 1)
+  if (invalidQuantityIndex >= 0) return `第 ${invalidQuantityIndex + 1} 项柜型需求的数量必须是大于 0 的整数`
+  const invalid = requirements.find((item) => {
     const specification = containerSpecification(item.containerType)
     return !specification || Number(item.capacityCbm) !== specification.capacityCbm
       || Number(item.maxWeightKg) !== specification.maxWeightKg