From aa11889dab7ffb8d0a4f9e5f62518c120349cc0d Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期日, 04 一月 2026 16:14:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 4
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 76 +++++++++++++------------
zy-acs-flow/src/page/sta/StaList.jsx | 4
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 16 ++++-
zy-acs-flow/src/page/sta/rowSx.jsx | 29 +++------
5 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index 6e2b39e..17523b9 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -146,9 +146,9 @@
<ReferenceField source="code" label="table.field.sta.code" reference="code" link={false} sortable={false}>
<TextField source="data" />
</ReferenceField>
- <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
+ {/* <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
<TextField source="name" />
- </ReferenceField>
+ </ReferenceField> */}
<TextField source="name" label="table.field.sta.name" />
<NumberField source="capacity" label="table.field.sta.capacity" />
{/* <NumberField source="occCnt" label="table.field.sta.occCnt" /> */}
diff --git a/zy-acs-flow/src/page/sta/rowSx.jsx b/zy-acs-flow/src/page/sta/rowSx.jsx
index cfac4bf..ac14e60 100644
--- a/zy-acs-flow/src/page/sta/rowSx.jsx
+++ b/zy-acs-flow/src/page/sta/rowSx.jsx
@@ -15,42 +15,35 @@
backgroundColor: 'action.selected',
};
}
- if (record.staSts$ === '鏃犺揣')
+ if (record.connect)
return {
...style,
borderLeftColor: green[500],
borderLeftWidth: 5,
borderLeftStyle: 'solid',
};
- if (record.staSts$ === '鏈夎揣')
- return {
- ...style,
- borderLeftColor: blue[500],
- borderLeftWidth: 5,
- borderLeftStyle: 'solid',
- };
- if (record.staSts$ === '绂佺敤')
+ if (!record.connect)
return {
...style,
borderLeftColor: red[500],
borderLeftWidth: 5,
borderLeftStyle: 'solid',
};
- if (record.staSts$ === '鏀捐揣棰勭害')
+ if (record.rsvInCnt && record.rsvInCnt > 0)
+ return {
+ ...style,
+ borderLeftColor: blue[500],
+ borderLeftWidth: 5,
+ borderLeftStyle: 'solid',
+ };
+ if (record.rsvOutCnt && record.rsvOutCnt > 0)
return {
...style,
borderLeftColor: orange[500],
borderLeftWidth: 5,
borderLeftStyle: 'solid',
};
- if (record.staSts$ === '鍙栬揣棰勭害')
- return {
- ...style,
- borderLeftColor: orange[500],
- borderLeftWidth: 5,
- borderLeftStyle: 'solid',
- };
- if (record.staSts$ === '鍏朵粬')
+ if (!record.statusBool)
return {
...style,
borderLeftColor: grey[500],
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
index de2f431..d37a3c6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
@@ -86,7 +86,7 @@
param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(agvModel.getBackpack(), stockList.size()) ; i++) {
Sta stockSta = stockList.get(i);
- String staCode = stockSta.getCode$();
+ String staCode = codeService.getCacheById(stockSta.getCode()).getData();
Loc idleLoc = null;
@@ -144,7 +144,7 @@
param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(agvModel.getBackpack(), idleList.size()) ; i++) {
Sta idleSta = idleList.get(i);
- String staCode = idleSta.getCode$();
+ String staCode = codeService.getCacheById(idleSta.getCode()).getData();
Loc stockLoc = null;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
index d091a78..605293b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
@@ -1,10 +1,12 @@
package com.zy.acs.manager.core.service;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.service.AreaAgvService;
+import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.StaService;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +29,8 @@
private AreaGovernService areaGovernService;
@Autowired
private AreaAgvService areaAgvService;
+ @Autowired
+ private CodeService codeService;
@PostConstruct
public void init() {
@@ -42,19 +46,23 @@
Sta destSta = null;
if (null != task.getOriLoc()) {
oriLoc = locService.getById(task.getOriLoc());
- return this.getAgvIdsByCode(oriLoc.getCode$());
+ Code code = codeService.getCacheById(oriLoc.getCode());
+ return this.getAgvIdsByCode(code.getData());
}
if (null != task.getOriSta()) {
oriSta = staService.getById(task.getOriSta());
- return this.getAgvIdsByCode(oriSta.getCode$());
+ Code code = codeService.getCacheById(oriSta.getCode());
+ return this.getAgvIdsByCode(code.getData());
}
if (null != task.getDestLoc()) {
destLoc = locService.getById(task.getDestLoc());
- return this.getAgvIdsByCode(destLoc.getCode$());
+ Code code = codeService.getCacheById(destLoc.getCode());
+ return this.getAgvIdsByCode(code.getData());
}
if (null != task.getDestSta()) {
destSta = staService.getById(task.getDestSta());
- return this.getAgvIdsByCode(destSta.getCode$());
+ Code code = codeService.getCacheById(destSta.getCode());
+ return this.getAgvIdsByCode(code.getData());
}
return null;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
index 8037257..8347a1f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
@@ -3,12 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.zy.acs.manager.manager.service.CodeService;
-import com.zy.acs.manager.manager.service.StaStsService;
-import com.zy.acs.manager.manager.service.StaTypeService;
-import com.zy.acs.manager.manager.service.ZoneService;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -103,40 +98,47 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public String getZoneId$(){
- ZoneService service = SpringUtils.getBean(ZoneService.class);
- Zone zone = service.getById(this.zoneId);
- if (!Cools.isEmpty(zone)){
- return String.valueOf(zone.getName());
- }
- return null;
- }
+// public String getZoneId$(){
+// ZoneService service = SpringUtils.getBean(ZoneService.class);
+// Zone zone = service.getById(this.zoneId);
+// if (!Cools.isEmpty(zone)){
+// return String.valueOf(zone.getName());
+// }
+// return null;
+// }
+//
+// public String getStaType$(){
+// StaTypeService service = SpringUtils.getBean(StaTypeService.class);
+// StaType staType = service.getById(this.staType);
+// if (!Cools.isEmpty(staType)){
+// return String.valueOf(staType.getName());
+// }
+// return null;
+// }
+//
+// public String getCode$(){
+// CodeService service = SpringUtils.getBean(CodeService.class);
+// Code code = service.getById(this.code);
+// if (!Cools.isEmpty(code)){
+// return String.valueOf(code.getUuid());
+// }
+// return null;
+// }
+//
+// public String getStaSts$(){
+// StaStsService service = SpringUtils.getBean(StaStsService.class);
+// StaSts staSts = service.getById(this.staSts);
+// if (!Cools.isEmpty(staSts)){
+// return String.valueOf(staSts.getName());
+// }
+// return null;
+// }
- public String getStaType$(){
- StaTypeService service = SpringUtils.getBean(StaTypeService.class);
- StaType staType = service.getById(this.staType);
- if (!Cools.isEmpty(staType)){
- return String.valueOf(staType.getName());
+ public Boolean getConnect() {
+ if (Cools.isEmpty(this.autoing)) {
+ return false;
}
- return null;
- }
-
- public String getCode$(){
- CodeService service = SpringUtils.getBean(CodeService.class);
- Code code = service.getById(this.code);
- if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
- }
- return null;
- }
-
- public String getStaSts$(){
- StaStsService service = SpringUtils.getBean(StaStsService.class);
- StaSts staSts = service.getById(this.staSts);
- if (!Cools.isEmpty(staSts)){
- return String.valueOf(staSts.getName());
- }
- return null;
+ return this.autoing.equals("1");
}
public Boolean getStatusBool(){
--
Gitblit v1.9.1