From 2a7b97eddbe3d24a47389a58dde46fe6175b6971 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 16 六月 2024 10:22:12 +0800
Subject: [PATCH] #
---
zy-asrs-flow/package.json | 10 +++++-----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java | 10 ++++++++--
zy-asrs-flow/src/pages/deviceManage/basShuttle/index.jsx | 13 +++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 15 +++++++++++++++
zy-asrs-flow/src/pages/deviceManage/basShuttle/components/edit.jsx | 8 ++++++++
5 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/package.json b/zy-asrs-flow/package.json
index 9a48ea3..18d437d 100644
--- a/zy-asrs-flow/package.json
+++ b/zy-asrs-flow/package.json
@@ -52,6 +52,7 @@
"@antv/x6": "^2.18.1",
"@antv/x6-plugin-stencil": "^2.1.5",
"@antv/xflow": "^2.0.4",
+ "@tweenjs/tween.js": "^21.0.0",
"@umijs/route-utils": "^2.2.2",
"antd": "^5.13.2",
"antd-style": "^3.6.1",
@@ -67,12 +68,11 @@
"react-dom": "^18.2.0",
"react-helmet-async": "^1.3.0",
"react-syntax-highlighter": "^15.5.0",
- "tweedle.js": "^2.1.0",
"three": "^0.155.0",
- "@tweenjs/tween.js": "^21.0.0"
+ "tweedle.js": "^2.1.0"
},
"devDependencies": {
- "@ant-design/pro-cli": "^3.3.0",
+ "@ant-design/pro-cli": "^3.1.0",
"@testing-library/react": "^13.4.0",
"@types/classnames": "^2.3.1",
"@types/express": "^4.17.21",
@@ -82,13 +82,13 @@
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react-helmet": "^6.1.11",
- "@umijs/fabric": "^2.14.1",
+ "@umijs/fabric": "^4.0.1",
"@umijs/lint": "^4.1.1",
"@umijs/max": "^4.1.1",
"cross-env": "^7.0.3",
"eslint": "^8.56.0",
"express": "^4.18.2",
- "gh-pages": "^3.2.3",
+ "gh-pages": "^6.1.1",
"husky": "^7.0.4",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
diff --git a/zy-asrs-flow/src/pages/deviceManage/basShuttle/components/edit.jsx b/zy-asrs-flow/src/pages/deviceManage/basShuttle/components/edit.jsx
index 4817589..8cec89c 100644
--- a/zy-asrs-flow/src/pages/deviceManage/basShuttle/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/deviceManage/basShuttle/components/edit.jsx
@@ -159,6 +159,14 @@
fieldProps={{ precision: 0 }}
/>
</ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="disableLev"
+ label="灏忚溅绂佺敤妤煎眰"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ />
+ </ProForm.Group>
</ProForm>
</Modal>
diff --git a/zy-asrs-flow/src/pages/deviceManage/basShuttle/index.jsx b/zy-asrs-flow/src/pages/deviceManage/basShuttle/index.jsx
index 1215082..cf8b0f4 100644
--- a/zy-asrs-flow/src/pages/deviceManage/basShuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/deviceManage/basShuttle/index.jsx
@@ -277,6 +277,19 @@
setSearchParam={setSearchParam}
/>,
},
+ {
+ title: '灏忚溅绂佺敤妤煎眰',
+ dataIndex: 'disableLev',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='disableLev'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
{
title: '鎿嶄綔',
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
index 7b0af1e..9a50b99 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
@@ -51,7 +51,7 @@
private Integer shuttleNo;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
@@ -125,7 +125,7 @@
private Integer runSpeed;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
@@ -143,6 +143,12 @@
@ApiModelProperty(value= "璁惧鐘舵��")
private String protocol;
+ /**
+ * 灏忚溅绂佺敤妤煎眰
+ */
+ @ApiModelProperty(value= "灏忚溅绂佺敤妤煎眰")
+ private String disableLev;
+
public BasShuttle() {}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index 85004c5..1226aa3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -86,6 +86,21 @@
continue;
}
+ BasShuttle basShuttle = basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>()
+ .eq(BasShuttle::getShuttleNo, device.getDeviceNo())
+ .eq(BasShuttle::getHostId, device.getHostId()));
+ if (basShuttle == null) {
+ continue;//灏忚溅鍩虹鏁版嵁涓嶅瓨鍦�
+ }
+
+ if (!Cools.isEmpty(basShuttle.getDisableLev())) {
+ List<Integer> disableLev = JSON.parseArray(basShuttle.getDisableLev(), Integer.class);
+ //妫�鏌ュ皬杞︽槸鍚︾鐢ㄨ妤煎眰
+ if (disableLev.contains(Utils.getLev(locNo))) {
+ continue;//灏忚溅绂佺敤璇ユゼ灞傝烦杩囪杞�
+ }
+ }
+
//妫�娴嬫槸鍚﹀瓨鍦ㄥ厖鐢典换鍔�
Task taskCharge = taskService.selectChargeWorking(Integer.valueOf(device.getDeviceNo()));
if (taskCharge != null) {
--
Gitblit v1.9.1