diff --git a/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue b/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue index 9cf144e8..e1a414e0 100644 --- a/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue +++ b/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue @@ -126,8 +126,8 @@ async function movePallet(item: DispatchPalletCandidateDto, containerId: string) if (containerFor(id)) { ElMessage.warning('该托盘已在其他装车托盘中'); return } if (target.palletIds.length >= target.capacity) { ElMessage.warning('该装车托盘已达到设置的托数'); return } const nextWeight = containerWeightLb(target) + weightLb(item) - if (nextWeight > target.maxWeightLb * 1.1) { ElMessage.warning(`${target.vehicleLabel}重量将达到 ${nextWeight.toFixed(0)}LB,超过限重10%,无法装入`); return } - if (nextWeight > target.maxWeightLb) ElMessage.warning(`${target.vehicleLabel}当前重量 ${nextWeight.toFixed(0)}LB,已超过额定限重 ${target.maxWeightLb}LB`) + if (nextWeight > target.maxWeightLb * 1.1) ElMessage.error(`${target.vehicleLabel}重量将达到 ${nextWeight.toFixed(0)}LB,已超过限重10%,请注意调整`) + else if (nextWeight > target.maxWeightLb) ElMessage.warning(`${target.vehicleLabel}当前重量 ${nextWeight.toFixed(0)}LB,已超过额定限重 ${target.maxWeightLb}LB`) const anchor = assigned.value[0] if (anchor?.customerId && anchor.customerId !== item.customerId) { ElMessage.warning('一次排车只能装同一客户的托盘'); return } if (anchor?.overseasWarehouseId && anchor.overseasWarehouseId !== item.overseasWarehouseId) { ElMessage.warning('一次排车只能装同一海外仓的托盘'); return } @@ -243,8 +243,8 @@ watch([warehouseTab, () => query.orderType], () => {