From 0e34b445bdf4cae20a75ac2ace622718e97e8025 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 10:41:01 +0800
Subject: [PATCH] #
---
version/db/new.sql | 5 ++
zy-acs-flow/src/page/loc/compDirect.js | 21 ++++++++++
zy-acs-flow/src/page/loc/LocList.jsx | 8 +++
zy-acs-flow/src/i18n/en.js | 7 +++
zy-acs-flow/src/page/loc/LocPanel.jsx | 3 +
zy-acs-flow/src/page/loc/LocEdit.jsx | 6 +--
zy-acs-flow/src/page/loc/LocCreate.jsx | 6 +--
zy-acs-flow/src/page/loc/LocInit.jsx | 8 +--
zy-acs-flow/src/i18n/zh.js | 7 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 4 +-
10 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index b6058d0..8518d65 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -59,4 +59,7 @@
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-update man_loc set comp_direct =2 where comp_direct =0
\ No newline at end of file
+update man_loc set comp_direct =2 where comp_direct =0
+
+alter table man_sta
+ add act_dir int(1) null comment '浣滀笟鏂瑰悜' after angle;
\ 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 3d19dee..4d0d3ef 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -687,6 +687,13 @@
},
levOffset: 'lev offset',
bottomOffset: 'bottom offset',
+ enums: {
+ compDirect: {
+ left: 'Left',
+ right: 'Right',
+ forward: 'Forward',
+ },
+ },
},
sta: {
depthHint: 'Set depth to 0 to keep the default value.',
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index a023bc8..cf6f8d4 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -687,6 +687,13 @@
},
levOffset: '姣忓眰楂樺害',
bottomOffset: '搴曢儴鍋忕Щ閲�',
+ enums: {
+ compDirect: {
+ left: '宸�',
+ right: '鍙�',
+ forward: '鍓�',
+ },
+ },
},
sta: {
depthHint: '娣卞害璁剧疆涓� 0 琛ㄧず娌跨敤榛樿鍊笺��',
diff --git a/zy-acs-flow/src/page/loc/LocCreate.jsx b/zy-acs-flow/src/page/loc/LocCreate.jsx
index 3270d8b..afebd46 100644
--- a/zy-acs-flow/src/page/loc/LocCreate.jsx
+++ b/zy-acs-flow/src/page/loc/LocCreate.jsx
@@ -30,6 +30,7 @@
import DialogCloseButton from "../components/DialogCloseButton";
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
+import { compDirectChoices } from "./compDirect";
const LocCreate = (props) => {
const { open, setOpen } = props;
@@ -156,10 +157,7 @@
<SelectInput
label="table.field.loc.compDirect"
source="compDirect"
- choices={[
- { id: 1, name: '澶т簬' },
- { id: 0, name: '灏忎簬' },
- ]}
+ choices={compDirectChoices}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
diff --git a/zy-acs-flow/src/page/loc/LocEdit.jsx b/zy-acs-flow/src/page/loc/LocEdit.jsx
index 3867ad0..f502249 100644
--- a/zy-acs-flow/src/page/loc/LocEdit.jsx
+++ b/zy-acs-flow/src/page/loc/LocEdit.jsx
@@ -28,6 +28,7 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
+import { compDirectChoices } from "./compDirect";
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -133,10 +134,7 @@
<SelectInput
label="table.field.loc.compDirect"
source="compDirect"
- choices={[
- { id: 1, name: '澶т簬' },
- { id: 0, name: '灏忎簬' },
- ]}
+ choices={compDirectChoices}
/>
</Stack>
<Stack direction='row' gap={2}>
diff --git a/zy-acs-flow/src/page/loc/LocInit.jsx b/zy-acs-flow/src/page/loc/LocInit.jsx
index d57670b..1ca4cb3 100644
--- a/zy-acs-flow/src/page/loc/LocInit.jsx
+++ b/zy-acs-flow/src/page/loc/LocInit.jsx
@@ -28,6 +28,7 @@
import DialogCloseButton from "../components/DialogCloseButton";
import CheckIcon from '@mui/icons-material/Check';
import request from '@/utils/request'
+import { compDirectChoices } from "./compDirect";
const LocInit = (props) => {
const { open, setOpen } = props;
@@ -166,10 +167,7 @@
<SelectInput
label="table.field.loc.compDirect"
source="compDirect"
- choices={[
- { id: 1, name: '澶т簬' },
- { id: 0, name: '灏忎簬' },
- ]}
+ choices={compDirectChoices}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -197,4 +195,4 @@
)
}
-export default LocInit;
\ No newline at end of file
+export default LocInit;
diff --git a/zy-acs-flow/src/page/loc/LocList.jsx b/zy-acs-flow/src/page/loc/LocList.jsx
index 83bdbc5..379f126 100644
--- a/zy-acs-flow/src/page/loc/LocList.jsx
+++ b/zy-acs-flow/src/page/loc/LocList.jsx
@@ -32,6 +32,7 @@
DeleteButton,
Button,
Pagination,
+ FunctionField,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -49,6 +50,7 @@
import rowSx from "./rowSx";
import BulkUpdateButton from "../components/BulkUpdateButton";
import LocBulkUpdateContent from './LocBulkUpdateContent';
+import { getCompDirectLabel } from './compDirect';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -170,7 +172,11 @@
<ReferenceField source="code" label="table.field.loc.code" reference="code" link={false} sortable={false}>
<TextField source="data" />
</ReferenceField>
- {/* <TextField source="compDirect$" label="table.field.loc.compDirect" sortable={false} /> */}
+ <FunctionField
+ label="table.field.loc.compDirect"
+ sortable={false}
+ render={(record) => getCompDirectLabel(translate, record?.compDirect)}
+ />
<ReferenceField source="locSts" label="table.field.loc.locSts" reference="locSts" link={false} sortable={true}>
<TextField source="name" />
</ReferenceField>
diff --git a/zy-acs-flow/src/page/loc/LocPanel.jsx b/zy-acs-flow/src/page/loc/LocPanel.jsx
index d8a73b8..761be35 100644
--- a/zy-acs-flow/src/page/loc/LocPanel.jsx
+++ b/zy-acs-flow/src/page/loc/LocPanel.jsx
@@ -6,6 +6,7 @@
} from 'react-admin';
import PanelTypography from "../components/PanelTypography";
import * as Common from '@/utils/common'
+import { getCompDirectLabel } from "./compDirect";
const LocPanel = () => {
const record = useRecordContext();
@@ -73,7 +74,7 @@
<Grid item xs={6}>
<PanelTypography
title="table.field.loc.compDirect"
- property={record.compDirect$}
+ property={getCompDirectLabel(translate, record.compDirect)}
/>
</Grid>
<Grid item xs={6}>
diff --git a/zy-acs-flow/src/page/loc/compDirect.js b/zy-acs-flow/src/page/loc/compDirect.js
new file mode 100644
index 0000000..f9c1bee
--- /dev/null
+++ b/zy-acs-flow/src/page/loc/compDirect.js
@@ -0,0 +1,21 @@
+const compDirectMap = {
+ 1: 'page.loc.enums.compDirect.left',
+ 2: 'page.loc.enums.compDirect.right',
+ 3: 'page.loc.enums.compDirect.forward',
+};
+
+export const compDirectChoices = [
+ { id: 1, name: compDirectMap[1] },
+ { id: 2, name: compDirectMap[2] },
+ { id: 3, name: compDirectMap[3] },
+];
+
+export const getCompDirectLabel = (translate, compDirect, fallback = '-') => {
+ const key = compDirectMap[compDirect];
+ if (!key) {
+ return fallback;
+ }
+ return typeof translate === 'function'
+ ? translate(key, { _: fallback })
+ : key;
+};
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
index c3cb502..16a385a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -158,9 +158,9 @@
return angle;
}
- // 鍧愭爣璐ф灦闃堝�� todo:luxiaotao
+ // 鍧愭爣璐ф灦闃堝��
public AgvDirectionType calculateAgvWorkDirectionByShelf(Loc loc, Code code) {
- Integer compDirect = loc.getCompDirect();
+ Integer compDirect = loc.getCompDirect();
return AgvDirectionType.fromVal(compDirect);
}
--
Gitblit v1.9.1