优化

2026-09-04 14:31:09 +08:00
parent 4eda56acf1
commit dd47f3841c
4 changed files with 13 additions and 4 deletions
@@ -375,7 +375,10 @@ function calculatedMeasurementRow(
  const matchedDimensions = mode === 'ADD' && rule
    ? rawDimensions.map((value) => value + rule.edgeAdditionCm * 2)
    : rawDimensions
-  const chargeRule = activeMeasurementChargeRule.value
+  const boundChargeRuleId = String(source.chargeRuleId || '')
+  const chargeRule = measurementChargeRules.value
+    .find((item) => item.id === boundChargeRuleId && item.status === 'ACTIVE')
+    || activeMeasurementChargeRule.value
  const specificationCoefficient = mode === 'MULTIPLY' && chargeRule
    ? matchedSpecificationCoefficient(chargeRule, calculationSource)
    : 1
@@ -985,7 +988,9 @@ async function updateMeasurementCalculationMode(row: Record<string, unknown> | n
 async function saveWarehouseOuterDimensions(row: Record<string, unknown>) {
  const summary = detail.value?.summary
  const measurement = measurementDetail.value
-  const editableMeasurementStatuses = new Set(['WAIT_MEASURE', 'MEASURING', 'MEASURE_PENDING', 'MEASURE_REJECTED'])
+  const editableMeasurementStatuses = new Set([
+    'WAIT_MEASURE', 'MEASURING', 'MEASURE_PENDING', 'MEASURE_REJECTED', 'WAIT_SPLIT',
+  ])
  const currentStatus = editableMeasurementStatuses.has(measurement?.processStatus || '')
    ? measurement!.processStatus
    : summary?.mainStatus || measurement?.processStatus || ''