From 65611d34fce5970c7b126fa81b5288d0a62704ee Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 09 四月 2024 15:59:11 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US/map.ts | 2 +-
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 16 +++++++++++++++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 7 +++++++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index 46ac1b3..2a0bea8 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -97,7 +97,7 @@
'map.settings.point.horizontal': 'Horizontal',
'': '',
'': '',
- '': '',
+ 'map.settings.conveyor.plc.no': 'Plc No',
'': '',
'': '',
'': '',
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index ddbfd55..3c45c91 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -300,7 +300,21 @@
{curSprite?.data?.type === Utils.SENSOR_TYPE.CONVEYOR && (
<>
-
+ <Form.Item
+ name='plcNo'
+ label={intl.formatMessage({ id: 'map.settings.conveyor.plc.no', defaultMessage: 'PLC缂栧彿' })}
+ rules={[
+ {
+ required: true,
+ },
+ ]}
+ >
+ <InputNumber
+ style={{
+ width: '50%',
+ }}
+ />
+ </Form.Item>
</>
)}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
index 47d47c4..f313881 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
@@ -45,4 +45,11 @@
return R.ok().add(mapService.getShelfLocNoList(locNo));
}
+
+ // 杈撻�佺嚎 - 搴撲綅 --------------------------------------------------------
+// @GetMapping("/conveyor/plc/list")
+// public R conveyorPlcList() {
+// return R.ok().add(mapService.getShelfLocNoList(locNo));
+// }
+
}
--
Gitblit v1.9.1