From ee33743c69348607e6e7eb19e60b566306e8fb67 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 03 四月 2025 09:43:11 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java |   35 +++++++++++++++--
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/StaGroupConstant.java       |   37 ++++++++++++++++++
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/StaGroupConstant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/StaGroupConstant.java
new file mode 100644
index 0000000..dfc8af7
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/StaGroupConstant.java
@@ -0,0 +1,37 @@
+package com.zy.acs.manager.core.constant;
+
+import java.util.ArrayList;
+
+public class StaGroupConstant {
+
+    public static final ArrayList<String> FAR_LEFT_STA_ROW_LIST  = new ArrayList<String>(){{
+        add("5-1");
+        add("5-2");
+        add("5-3");
+    }};
+
+    public static final ArrayList<String> LEFT_STA_ROW_LIST  = new ArrayList<String>(){{
+        add("4-1");
+        add("4-2");
+        add("4-3");
+    }};
+
+    public static final ArrayList<String> MIDDLE_STA_ROW_LIST  = new ArrayList<String>(){{
+        add("3-1");
+        add("3-2");
+        add("3-3");
+    }};
+
+    public static final ArrayList<String> RIGHT_STA_ROW_LIST  = new ArrayList<String>(){{
+        add("2-1");
+        add("2-2");
+        add("2-3");
+    }};
+
+    public static final ArrayList<String> FAR_RIGHT_STA_ROW_LIST  = new ArrayList<String>(){{
+        add("1-1");
+        add("1-2");
+        add("1-3");
+    }};
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index b9bd4c9..7100cb6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -226,13 +226,13 @@
                 oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
                 oriLoc.setUpdateTime(now);
                 if (!locService.updateById(oriLoc)) {
-                    throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                    throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
                 }
 
                 destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
                 destLoc.setUpdateTime(now);
                 if (!locService.updateById(destLoc)) {
-                    throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                    throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
                 }
                 break;
             case LOC_TO_STA:
@@ -240,18 +240,45 @@
                 oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
                 oriLoc.setUpdateTime(now);
                 if (!locService.updateById(oriLoc)) {
-                    throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                    throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                }
+
+                destSta = staService.getById(task.getDestSta());
+                destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
+                destSta.setUpdateTime(now);
+                if (!staService.updateById(destSta)) {
+                    throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
                 }
                 break;
             case STA_TO_LOC:
+                oriSta = staService.getById(task.getOriSta());
+                oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
+                oriSta.setUpdateTime(now);
+                if (!staService.updateById(oriSta)) {
+                    throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                }
+
                 destLoc = locService.getById(task.getDestLoc());
                 destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
                 destLoc.setUpdateTime(now);
                 if (!locService.updateById(destLoc)) {
-                    throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                    throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
                 }
                 break;
             case STA_TO_STA:
+                oriSta = staService.getById(task.getOriSta());
+                oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
+                oriSta.setUpdateTime(now);
+                if (!staService.updateById(oriSta)) {
+                    throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                }
+
+                destSta = staService.getById(task.getDestSta());
+                destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
+                destSta.setUpdateTime(now);
+                if (!staService.updateById(destSta)) {
+                    throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+                }
                 break;
             case TO_CHARGE:
             case TO_STANDBY:

--
Gitblit v1.9.1