Merge remote-tracking branch 'origin/test' into dev

2026-09-09 03:40:54 +08:00
parent a99a54493b 68a5612598
commit bfcec93017
2 changed files with 21 additions and 1 deletions
@@ -308,7 +308,7 @@ public class FbaPricingRepository {
            .eq(InboundPricingEntity::getProcessStatus, processStatus)
            .in(InboundPricingEntity::getFeeStatus, List.of("UNPRICED", "CALCULATED", "SENT"))
            .set(InboundPricingEntity::getFeeStatus, "CALCULATED");
-        if (!List.of("WAIT_PALLET", "WAIT_SPLIT", "LOADING").contains(processStatus)) {
+        if (!List.of("WAIT_PALLET", "WAIT_PALLETIZE", "WAIT_SPLIT", "LOADING").contains(processStatus)) {
            update.set(InboundPricingEntity::getProcessStatus, "FEE_CONFIRMING");
        }
        if ("KG".equals(chargeMode)) update.set(InboundPricingEntity::getChargeableWeightKg, chargeable);