From dccd8442c8015ae48453168aceacff64ad28f994 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 27 一月 2026 09:31:35 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/sta/StaEdit.jsx | 14 ++++++++++++--
zy-acs-flow/src/page/sta/StaCreate.jsx | 20 ++++++++++++++++----
zy-acs-flow/src/page/sta/StaPanel.jsx | 2 ++
zy-acs-flow/src/i18n/en.js | 2 ++
zy-acs-flow/src/page/sta/StaList.jsx | 5 ++++-
zy-acs-flow/src/i18n/zh.js | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java | 2 ++
7 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 7852763..cd64e21 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -290,6 +290,8 @@
height: "height",
depth: "depth",
angle: 'angle',
+ inboundWait: 'inbound wait(ms)',
+ outboundWait: 'outbound wait(ms)',
autoing: "autoing",
loading: "loading",
inEnable: "in enable",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 78edf73..03ceaf9 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -290,6 +290,8 @@
height: "浣滀笟楂樺害",
depth: "浣滀笟娣卞害",
angle: '浣滀笟瑙掑害',
+ inboundWait: '鍏ュ簱绛夊緟(姣)',
+ outboundWait: '鍑哄簱绛夊緟(姣)',
autoing: "鑷姩",
loading: "杞借揣",
inEnable: "鍙叆",
diff --git a/zy-acs-flow/src/page/sta/StaCreate.jsx b/zy-acs-flow/src/page/sta/StaCreate.jsx
index 6fc6557..dee5771 100644
--- a/zy-acs-flow/src/page/sta/StaCreate.jsx
+++ b/zy-acs-flow/src/page/sta/StaCreate.jsx
@@ -162,8 +162,8 @@
</Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.sta.hight"
- source="hight"
+ label="table.field.sta.height"
+ source="height"
validate={required()}
/>
</Grid>
@@ -179,6 +179,18 @@
label="table.field.sta.angle"
source="angle"
validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.sta.inboundWait"
+ source="inboundWait"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.sta.outboundWait"
+ source="outboundWait"
/>
</Grid>
{/* <Grid item xs={6} display="flex" gap={1}>
@@ -230,9 +242,9 @@
</ReferenceInput>
</Grid> */}
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
- </Grid>
+ </Grid> */}
<Grid item xs={12} display="flex" gap={1}>
<Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
diff --git a/zy-acs-flow/src/page/sta/StaEdit.jsx b/zy-acs-flow/src/page/sta/StaEdit.jsx
index 004e34a..e556e42 100644
--- a/zy-acs-flow/src/page/sta/StaEdit.jsx
+++ b/zy-acs-flow/src/page/sta/StaEdit.jsx
@@ -142,8 +142,8 @@
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.sta.hight"
- source="hight"
+ label="table.field.sta.height"
+ source="height"
validate={required()}
/>
<NumberInput
@@ -153,6 +153,16 @@
/>
</Stack>
<Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.sta.inboundWait"
+ source="inboundWait"
+ />
+ <NumberInput
+ label="table.field.sta.outboundWait"
+ source="outboundWait"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
{/* <NumberInput
label="table.field.sta.occCnt"
source="occCnt"
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index 4c976b9..5309291 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -134,7 +134,8 @@
expand={() => <StaPanel />}
expandSingle={true}
rowSx={rowSx(drawerVal || null)}
- omit={['id', 'uuid', 'name', 'offset', 'zpallet', 'updateBy', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'name', 'offset', 'zpallet'
+ , 'updateTime', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
@@ -160,6 +161,8 @@
<NumberField source="hight" label="table.field.sta.height" />
<NumberField source="depth" label="table.field.sta.depth" />
<NumberField source="angle" label="table.field.sta.angle" />
+ <NumberField source="inboundWait" label="table.field.sta.inboundWait" />
+ <NumberField source="outboundWait" label="table.field.sta.outboundWait" />
{/* <TextField source="autoing" label="table.field.sta.autoing" />
<TextField source="loading" label="table.field.sta.loading" />
<TextField source="inEnable" label="table.field.sta.inEnable" />
diff --git a/zy-acs-flow/src/page/sta/StaPanel.jsx b/zy-acs-flow/src/page/sta/StaPanel.jsx
index 49a314c..88d4d94 100644
--- a/zy-acs-flow/src/page/sta/StaPanel.jsx
+++ b/zy-acs-flow/src/page/sta/StaPanel.jsx
@@ -44,6 +44,8 @@
// { labelKey: 'table.field.sta.offset', valueKey: 'offset' },
{ labelKey: 'table.field.sta.height', valueKey: 'height' },
{ labelKey: 'table.field.sta.depth', valueKey: 'depth' },
+ { labelKey: 'table.field.sta.inboundWait', valueKey: 'inboundWait' },
+ { labelKey: 'table.field.sta.outboundWait', valueKey: 'outboundWait' },
{ labelKey: 'table.field.sta.zpallet', valueKey: 'zpallet' },
];
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java
index 40b0939..5bd01a2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java
@@ -12,6 +12,7 @@
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.StaReserve;
+import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.StaReserveService;
import com.zy.acs.manager.manager.service.StaService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -72,6 +73,7 @@
sta.setCreateTime(now);
sta.setUpdateBy(loginUserId);
sta.setUpdateTime(now);
+ sta.setStatus(StatusType.ENABLE.val);
if (!staService.save(sta)) {
return R.error("Save Fail");
}
--
Gitblit v1.9.1