🐛 待回单确认：业务状态比较统一为忽略大小写

2026-10-22 14:48:20 +08:00
parent 6673ed38f3
commit 35127760df
1 changed files with 3 additions and 3 deletions
@@ -540,9 +540,9 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 				if (completed) {
 					waybillBusinessStatus = STATUS_COMPLETED;
 				}
-			} else if (WaybillProcessSupport.STATUS_RUNNING.equals(waybill.getBusinessStatus())) {
-				// 只有进行中能进入：canAutoCompleteWaybill 的状态口径含待执行/待调度等，不能替代这一条；
-				// 待回单确认在 isPunchEnded 里算已结束，不能从结束态重进。
+			} else if (WaybillProcessSupport.STATUS_RUNNING.equalsIgnoreCase(waybill.getBusinessStatus())) {
+				// 当前业务状态为 running 才置为待回单确认；canAutoCompleteWaybill 的状态口径还含待执行/待调度。
+				// 待回单确认在 isPunchEnded 里与已完成、已取消同属结束态。
 				waybill.setBusinessStatus(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM);
 				waybillService.updateById(waybill);
 				waybillBusinessStatus = WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM;