From b73d4c5f5995bdb38fab1cdfdf413e759db261f2 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 26 十二月 2025 10:42:23 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/sta/StaEdit.jsx | 35 ++++++-----
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java | 14 ++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 93 ++++---------------------------
zy-acs-flow/src/page/sta/StaCreate.jsx | 11 +++
zy-acs-flow/src/i18n/en.js | 4 +
zy-acs-flow/src/page/sta/StaList.jsx | 8 ++
version/db/sqlIndex | 7 ++
zy-acs-flow/src/i18n/zh.js | 4 +
8 files changed, 73 insertions(+), 103 deletions(-)
diff --git a/version/db/sqlIndex b/version/db/sqlIndex
index 02c890b..a1317b0 100644
--- a/version/db/sqlIndex
+++ b/version/db/sqlIndex
@@ -33,4 +33,9 @@
CREATE INDEX idx_agv_deleted_uuid ON man_agv (deleted, uuid);
# sys_config
CREATE INDEX idx_config_flag ON sys_config(flag);
-CREATE INDEX idx_config_deleted_flag ON sys_config(deleted, flag);
\ No newline at end of file
+CREATE INDEX idx_config_deleted_flag ON sys_config(deleted, flag);
+# man_sta_reserve
+CREATE INDEX idx_sta_state ON man_sta_reserve (sta_id, state);
+CREATE INDEX idx_task ON man_sta_reserve (task_id);
+CREATE INDEX idx_agv ON man_sta_reserve (agv_id);
+CREATE INDEX idx_sta_type_state ON man_sta_reserve (sta_id, reserve_type, state);
\ No newline at end of file
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index c62a1e9..a6668c1 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -286,6 +286,10 @@
outEnable: "out enable",
zpallet: "zpallet",
staSts: "station status",
+ capacity: "capacity",
+ occCnt: 'occupancy qty',
+ rsvInCnt: 'reserve release qty',
+ rsvOutCnt: 'reserved pickup qty',
},
codeGap: {
code0: "code 1",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 31de76b..853312d 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -286,6 +286,10 @@
outEnable: "鍙嚭",
zpallet: "鏂欑鐮�",
staSts: "绔欑偣鐘舵��",
+ capacity: "妲戒綅鏁�",
+ occCnt: '鍗犵敤鏁�',
+ rsvInCnt: '棰勭害鏀捐揣閲�',
+ rsvOutCnt: '棰勭害鍙栬揣閲�',
},
codeGap: {
code0: "code 1",
diff --git a/zy-acs-flow/src/page/sta/StaCreate.jsx b/zy-acs-flow/src/page/sta/StaCreate.jsx
index 8cc6844..d462dc4 100644
--- a/zy-acs-flow/src/page/sta/StaCreate.jsx
+++ b/zy-acs-flow/src/page/sta/StaCreate.jsx
@@ -120,7 +120,7 @@
parse={v => v}
/>
</Grid> */}
- {/* <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="staType"
reference="staType"
@@ -132,7 +132,7 @@
validate={required()}
/>
</ReferenceInput>
- </Grid> */}
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="code"
@@ -148,6 +148,13 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
+ label="table.field.sta.capacity"
+ source="capacity"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
label="table.field.sta.offset"
source="offset"
validate={required()}
diff --git a/zy-acs-flow/src/page/sta/StaEdit.jsx b/zy-acs-flow/src/page/sta/StaEdit.jsx
index b80a65c..d45ee98 100644
--- a/zy-acs-flow/src/page/sta/StaEdit.jsx
+++ b/zy-acs-flow/src/page/sta/StaEdit.jsx
@@ -120,27 +120,30 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <TextInput
- label="table.field.sta.autoing"
- source="autoing"
- parse={v => v}
+ <NumberInput
+ label="table.field.sta.capacity"
+ source="capacity"
+ validate={required()}
/>
- <TextInput
- label="table.field.sta.loading"
- source="loading"
- parse={v => v}
+ <NumberInput
+ label="table.field.sta.occCnt"
+ source="occCnt"
+ InputProps={{ readOnly: true }}
+ disabled
/>
</Stack>
<Stack direction='row' gap={2}>
- <TextInput
- label="table.field.sta.inEnable"
- source="inEnable"
- parse={v => v}
+ <NumberInput
+ label="table.field.sta.rsvInCnt"
+ source="rsvInCnt"
+ InputProps={{ readOnly: true }}
+ disabled
/>
- <TextInput
- label="table.field.sta.outEnable"
- source="outEnable"
- parse={v => v}
+ <NumberInput
+ label="table.field.sta.rsvOutCnt"
+ source="rsvOutCnt"
+ InputProps={{ readOnly: true }}
+ disabled
/>
</Stack>
</Grid>
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index 6a6e484..3830532 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -147,11 +147,15 @@
<TextField source="name" />
</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" />
+ <NumberField source="rsvInCnt" label="table.field.sta.rsvInCnt" />
+ <NumberField source="rsvOutCnt" label="table.field.sta.rsvOutCnt" />
<NumberField source="offset" label="table.field.sta.offset" />
- <TextField source="autoing" label="table.field.sta.autoing" />
+ {/* <TextField source="autoing" label="table.field.sta.autoing" />
<TextField source="loading" label="table.field.sta.loading" />
<TextField source="inEnable" label="table.field.sta.inEnable" />
- <TextField source="outEnable" label="table.field.sta.outEnable" />
+ <TextField source="outEnable" label="table.field.sta.outEnable" /> */}
<TextField source="zpallet" label="table.field.sta.zpallet" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
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 16ee3c6..bd00fa4 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
@@ -1,6 +1,5 @@
package com.zy.acs.manager.core.service;
-import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Sta;
@@ -13,6 +12,19 @@
import java.util.Date;
// man_segment: start_time, 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 {
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 5cdd1cc..8037257 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
@@ -21,142 +21,85 @@
private static final long serialVersionUID = 1L;
- /**
- * ID
- */
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 缂栧彿
- */
@ApiModelProperty(value= "缂栧彿")
private String uuid;
- /**
- * 搴撳尯
- */
@ApiModelProperty(value= "搴撳尯")
private Long zoneId;
- /**
- * 绔欏彿
- */
@ApiModelProperty(value= "绔欏彿")
private String staNo;
- /**
- * 鍚嶇О
- */
@ApiModelProperty(value= "鍚嶇О")
private String name;
- /**
- * 绔欑被鍨�
- */
@ApiModelProperty(value= "绔欑被鍨�")
private Long staType;
- /**
- * 鏉＄爜
- */
@ApiModelProperty(value= "鏉＄爜")
private Long code;
- /**
- * 鍋忕Щ閲�
- */
+ @ApiModelProperty(value= "妲戒綅鏁�")
+ private Integer capacity;
+
+ @ApiModelProperty(value= "鍗犵敤鏁�")
+ private Integer occCnt;
+
+ @ApiModelProperty(value= "棰勭害鏀捐揣閲�")
+ private Integer rsvInCnt;
+
+ @ApiModelProperty(value= "棰勭害鍙栬揣閲�")
+ private Integer rsvOutCnt;
+
@ApiModelProperty(value= "鍋忕Щ閲�")
private Double offset;
- /**
- * 浣滀笟瑙掑害
- */
@ApiModelProperty(value= "浣滀笟瑙掑害")
private String angle;
- /**
- * 鑷姩
- */
@ApiModelProperty(value= "鑷姩")
private String autoing;
- /**
- * 鏈夌墿
- */
@ApiModelProperty(value= "鏈夌墿")
private String loading;
- /**
- * 鍙叆
- */
@ApiModelProperty(value= "鍙叆")
private String inEnable;
- /**
- * 鍙嚭
- */
@ApiModelProperty(value= "鍙嚭")
private String outEnable;
- /**
- * 鎵樼洏鐮�
- */
@ApiModelProperty(value= "鎵樼洏鐮�")
private String zpallet;
- /**
- * 绔欑姸鎬�
- */
@ApiModelProperty(value= "绔欑姸鎬�")
private Long staSts;
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
- */
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
private Integer deleted;
- /**
- * 绉熸埛
- */
@ApiModelProperty(value= "绉熸埛")
private Long tenantId;
- /**
- * 娣诲姞浜哄憳
- */
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
- /**
- * 娣诲姞鏃堕棿
- */
@ApiModelProperty(value= "娣诲姞鏃堕棿")
private Date createTime;
- /**
- * 淇敼浜哄憳
- */
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
- /**
- * 淇敼鏃堕棿
- */
@ApiModelProperty(value= "淇敼鏃堕棿")
private Date updateTime;
- /**
- * 澶囨敞
- */
@ApiModelProperty(value= "澶囨敞")
private String memo;
@@ -194,18 +137,6 @@
return String.valueOf(staSts.getName());
}
return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "鍐荤粨";
- default:
- return String.valueOf(this.status);
- }
}
public Boolean getStatusBool(){
--
Gitblit v1.9.1