From 0b3ff4b806168d3a1959b19bdf331a86367c0883 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 28 四月 2024 09:38:46 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java | 1
zy-asrs-flow/src/locales/en-US/map.ts | 3 +
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 38 +++++++++++++++++++
zy-asrs-flow/src/pages/User/Login/index.jsx | 20 +++++----
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 19 +++++++++
5 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index 0fd387d..e905fe3 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -8,6 +8,8 @@
'map.save': 'Save Map',
'map.load': 'Load Map',
'map.clear': 'Clear Map',
+ 'map.x': 'x',
+ 'map.y': 'y',
'map.load.success': 'Welcome To WCS.',
'': '',
'': '',
@@ -132,6 +134,7 @@
'map.settings.shelf.lift': 'Lift',
'map.settings.shelf.charge': 'Charge',
'map.settings.shelf.diable': 'Diable',
+ 'map.settings.shelf.reference': 'Reference',
'': '',
'': '',
'': '',
diff --git a/zy-asrs-flow/src/pages/User/Login/index.jsx b/zy-asrs-flow/src/pages/User/Login/index.jsx
index 091aed2..c32f457 100644
--- a/zy-asrs-flow/src/pages/User/Login/index.jsx
+++ b/zy-asrs-flow/src/pages/User/Login/index.jsx
@@ -90,15 +90,17 @@
useEffect(() => {
const fetchHostList = async () => {
const resp = await Http.doGet('api/auth/host');
- const list = resp.data.map(item => ({
- label: item.name,
- value: item.id
- }));
- setHostList(list);
- if (list && list.length > 0) {
- form.setFieldsValue({
- hostId: list[0].value
- });
+ if (resp?.data) {
+ const list = resp.data.map(item => ({
+ label: item.name,
+ value: item.id
+ }));
+ setHostList(list);
+ if (list && list.length > 0) {
+ form.setFieldsValue({
+ hostId: list[0].value
+ });
+ }
}
}
fetchHostList();
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 681624e..939b245 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -313,6 +313,44 @@
</Space.Compact>
</Form.Item>
<Form.Item
+ label={intl.formatMessage({ id: 'map.settings.shelf.reference', defaultMessage: '鍩哄噯鍊�' })}
+ >
+ <Space.Compact>
+ <Form.Item
+ name='refx'
+ noStyle
+ rules={[
+ {
+ required: false,
+ },
+ ]}
+ >
+ <InputNumber
+ addonBefore={<Space.Compact><FormattedMessage id='map.x' defaultMessage='x' /></Space.Compact>}
+ style={{
+ width: '50%',
+ }}
+ />
+ </Form.Item>
+ <Form.Item
+ name='refy'
+ noStyle
+ rules={[
+ {
+ required: false,
+ },
+ ]}
+ >
+ <InputNumber
+ addonBefore={<Space.Compact><FormattedMessage id='map.y' defaultMessage='y' /></Space.Compact>}
+ style={{
+ width: '50%',
+ }}
+ />
+ </Form.Item>
+ </Space.Compact>
+ </Form.Item>
+ <Form.Item
name='value'
label={intl.formatMessage({ id: 'map.settings.shelf.value', defaultMessage: '鍦板浘鍊�' })}
>
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index 261e041..f196974 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
@@ -131,6 +131,25 @@
copiedSprite.data.bay = curSprite.data.bay + i + 1;
}
}
+ // reference value
+ if (copiedSprite.data.refx && copiedSprite.data.refy) {
+ switch (values.copyDire) {
+ case 'left':
+ copiedSprite.data.refx -= curSprite.data.left * (i + 1);
+ break;
+ case 'right':
+ copiedSprite.data.refx += curSprite.data.right * (i + 1);
+ break;
+ case 'top':
+ copiedSprite.data.refy -= curSprite.data.top * (i + 1);
+ break;
+ case 'bottom':
+ copiedSprite.data.refy += curSprite.data.bottom * (i + 1);
+ break;
+ default:
+ break;
+ }
+ }
if (copiedSprite.data.row && copiedSprite.data.bay) {
copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
index 50cd64c..1b2862f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
@@ -35,6 +35,7 @@
"/api/auth/host",
"/test/**",
"/api/login",
+ "/api/auth/host",
"/druid/**",
"/swagger-ui.html",
"/swagger-resources/**",
--
Gitblit v1.9.1