From aad36163fc3424143f6373d486494dfc6786c263 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 14 十一月 2025 18:06:02 +0800
Subject: [PATCH] 11

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java |   83 ++++++++++++++++++++++++++++-------------
 1 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
index d73227f..e66a2e2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
@@ -44,7 +44,7 @@
     }
 
     @Override
-    public void taskCallBack(Task task) {
+    public void taskCallBackOtbin(Task task) {
         if (null == task) {
             return;
         }
@@ -54,9 +54,7 @@
         Date now = new Date();
         // loc status
         Loc oriLoc = null;
-        Loc destLoc = null;
         Sta oriSta = null;
-        Sta destSta = null;
         switch (Objects.requireNonNull(TaskTypeType.get(task.getTaskTypeEl()))) {
             case LOC_TO_LOC:
                 oriLoc = this.getById(task.getOriLoc());
@@ -68,14 +66,6 @@
                     }
                 }
 
-                destLoc = this.getById(task.getDestLoc());
-                if (destLoc.getLocSts().equals(LocStsType.PAKIN.val())) {
-                    destLoc.setLocSts(LocStsType.STOCK.val());
-                    destLoc.setUpdateTime(now);
-                    if (!this.updateById(destLoc)) {
-                        log.error("Loc [{}] 搴撲綅淇敼鐘舵�佸け璐�", task.getDestLoc$());
-                    }
-                }
                 break;
             case LOC_TO_STA:
                 oriLoc = this.getById(task.getOriLoc());
@@ -87,14 +77,6 @@
                     }
                 }
 
-                destSta = staService.getById(task.getDestSta());
-                if (destSta.getStaSts().equals(StaStsType.READY_RELEASE.val())) {
-                    destSta.setStaSts(StaStsType.STOCK.val());
-                    destSta.setUpdateTime(now);
-                    if (!staService.updateById(destSta)) {
-                        log.error("Sta [{}] 绔欑偣淇敼鐘舵�佸け璐�", task.getDestSta$());
-                    }
-                }
                 break;
             case STA_TO_LOC:
                 oriSta = staService.getById(task.getOriSta());
@@ -106,14 +88,6 @@
                     }
                 }
 
-                destLoc = this.getById(task.getDestLoc());
-                if (destLoc.getLocSts().equals(LocStsType.PAKIN.val())) {
-                    destLoc.setLocSts(LocStsType.STOCK.val());
-                    destLoc.setUpdateTime(now);
-                    if (!this.updateById(destLoc)) {
-                        log.error("Loc [{}] 搴撲綅淇敼鐘舵�佸け璐�", task.getDestLoc$());
-                    }
-                }
                 break;
             case STA_TO_STA:
                 oriSta = staService.getById(task.getOriSta());
@@ -125,6 +99,61 @@
                     }
                 }
 
+                break;
+            case TO_CHARGE:
+            case TO_STANDBY:
+            case MOVE:
+                break;
+            default:
+                break;
+        }
+
+    }
+
+    @Override
+    public void taskCallBackEnd(Task task) {
+        if (null == task) {
+            return;
+        }
+        if (!task.getTaskSts().equals(TaskStsType.PROGRESS.val())) {
+            return;
+        }
+        Date now = new Date();
+        // loc status
+        Loc destLoc = null;
+        Sta destSta = null;
+        switch (Objects.requireNonNull(TaskTypeType.get(task.getTaskTypeEl()))) {
+            case LOC_TO_LOC:
+                destLoc = this.getById(task.getDestLoc());
+                if (destLoc.getLocSts().equals(LocStsType.PAKIN.val())) {
+                    destLoc.setLocSts(LocStsType.STOCK.val());
+                    destLoc.setUpdateTime(now);
+                    if (!this.updateById(destLoc)) {
+                        log.error("Loc [{}] 搴撲綅淇敼鐘舵�佸け璐�", task.getDestLoc$());
+                    }
+                }
+                break;
+            case LOC_TO_STA:
+                destSta = staService.getById(task.getDestSta());
+                if (destSta.getStaSts().equals(StaStsType.READY_RELEASE.val())) {
+                    destSta.setStaSts(StaStsType.STOCK.val());
+                    destSta.setUpdateTime(now);
+                    if (!staService.updateById(destSta)) {
+                        log.error("Sta [{}] 绔欑偣淇敼鐘舵�佸け璐�", task.getDestSta$());
+                    }
+                }
+                break;
+            case STA_TO_LOC:
+                destLoc = this.getById(task.getDestLoc());
+                if (destLoc.getLocSts().equals(LocStsType.PAKIN.val())) {
+                    destLoc.setLocSts(LocStsType.STOCK.val());
+                    destLoc.setUpdateTime(now);
+                    if (!this.updateById(destLoc)) {
+                        log.error("Loc [{}] 搴撲綅淇敼鐘舵�佸け璐�", task.getDestLoc$());
+                    }
+                }
+                break;
+            case STA_TO_STA:
                 destSta = staService.getById(task.getDestSta());
                 if (destSta.getStaSts().equals(StaStsType.READY_RELEASE.val())) {
                     destSta.setStaSts(StaStsType.STOCK.val());

--
Gitblit v1.9.1