#

Junjie

2024-06-16 2a7b97eddbe3d24a47389a58dde46fe6175b6971

#

 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",

 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>

 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: '操作',

 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() {}



 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) {