From 73bb5617e6aeb4ee8f7dfd4ad54b61d477969d86 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 10 六月 2025 20:22:06 +0800
Subject: [PATCH] 自动充放电自动化流程
---
src/main/java/com/whyc/service/WmsService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index ceb2527..12c177d 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -241,7 +241,21 @@
//寮�濮嬪彇娲诲寲缁撴潫鐨勭數姹�,濡傛灉浠诲姟缂栧彿鍦ㄦ洿鏂扮數姹犱粨搴撲腑瀛樺湪,鍒欐洿鏂版椿鍖栨椂闂翠负褰撳墠鏃堕棿
BattWarehouse battWarehouse =battWarehouseService.getByTaskNo(taskNo);
if(battWarehouse != null){
- battWarehouseService.finishActivationById(battWarehouse.getId());
+ String activateTaskNo = battWarehouse.getTaskNo();
+ String chargeTaskNo = battWarehouse.getChargeTaskNo();
+ String dischargeTaskNo = battWarehouse.getDischargeTaskNo();
+ if(activateTaskNo.equals(taskNo)) {
+ //濡傛灉鏄椿鍖栦换鍔�,鍒欐洿鏂版暟鎹簱涓浠诲姟瀹屾垚鏃堕棿
+ battWarehouseService.finishActivationById(battWarehouse.getId());
+ }
+ else if (chargeTaskNo.equals(taskNo)) {
+ //濡傛灉鏄厖鐢典换鍔�,鍒欐洿鏂版暟鎹簱涓浠诲姟瀹屾垚鏃堕棿
+ battWarehouseService.finishChargeById(battWarehouse.getId());
+ }
+ else if (dischargeTaskNo.equals(taskNo)) {
+ //濡傛灉鏄斁鐢典换鍔�,鍒欐洿鏂版暟鎹簱涓浠诲姟瀹屾垚鏃堕棿
+ battWarehouseService.finishDischargeById(battWarehouse.getId());
+ }
}
task.setActivationChamberPickUpTime(statusTime);break;
case 24:
--
Gitblit v1.9.1