From b1dd4c6e284244bd7224e2c050a9670fbd9a38ea Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 16:21:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java | 19 ++-----------------
/dev/null | 8 --------
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
index ff1ea3f..12c37f9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
@@ -13,21 +13,6 @@
import java.util.List;
import java.util.Objects;
-// man_segment: start_time, end_time, alter table man_segment
-// add roller_waiting int(1) default 0 null comment '婊氱瓛绾跨瓑寰�' after end_time;
-/**
- * alter table man_sta
- * add capacity int null comment '妲戒綅鏁�' after angle;
- *
- * alter table man_sta
- * add occ_cnt int null comment '鍗犵敤鏁�' after capacity;
- *
- * alter table man_sta
- * add rsv_in_cnt int null comment '棰勭害鏀捐揣閲�' after occ_cnt;
- *
- * alter table man_sta
- * add rsv_out_cnt int null comment '棰勭害鍙栬揣閲�' after rsv_in_cnt;
- */
@Slf4j
@Service
public class TransferStationHandler {
@@ -55,8 +40,9 @@
if (currSeg == null) {
throw new NullPointerException("segment is null in hasDelayAtSta.");
}
+ Long agvId = currSeg.getAgvId();
// 鍒ゆ柇AGV鏄惁鍦ㄦ粴鍔ㄨ緭閫佺嚎鍓�
- Code currentCode = agvDetailService.getCurrentCode(currSeg.getAgvId());
+ Code currentCode = agvDetailService.getCurrentCode(agvId);
if (null == currentCode) {
return false;
}
@@ -77,7 +63,6 @@
}
long preEndTime = preSeg.getEndTime().getTime();
long now = System.currentTimeMillis();
- Long agvId = currSeg.getAgvId();
// inbound
if (prePosType.equals(TaskPosDto.PosType.ORI_STA)) {
diff --git a/zy-acs-manager/src/main/java/lane.sql b/zy-acs-manager/src/main/java/lane.sql
deleted file mode 100644
index b109824..0000000
--- a/zy-acs-manager/src/main/java/lane.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.lane', '0', '/manager/lane', 'lane', '0' , '0', '1' , '1');
--- BorderHorizontal
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query Lane', '', '1', 'manager:lane:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create Lane', '', '1', 'manager:lane:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update Lane', '', '1', 'manager:lane:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete Lane', '', '1', 'manager:lane:remove', '3', '1', '1');
-
--
Gitblit v1.9.1