diff --git a/lms/nladmin-system/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/src/main/java/org/nl/AppRun.java index b33ebc4ac..8bae8c58d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/lms/nladmin-system/src/main/java/org/nl/AppRun.java @@ -104,9 +104,10 @@ public class AppRun { "layer_num = 1 AND col_num = " + j, "block_num DESC, row_num DESC").getResultJSONArray(0); for (int k = 0; k < array.size(); k++) { // 1,2...块的每列数据 JSONObject object = array.getJSONObject(k); + if (k-1 >= 0) { // 如果块与块不同,空一个距离 JSONObject object2 = array.getJSONObject(k-1); - if (!object2.getString("block_num").equals(object.getString("block_num"))) { + if (!object2.getString("block_num").equals(object.getString("block_num")) && object2.getString("is_delete").equals(object.getString("is_delete"))) { JSONObject node2 = new JSONObject(); node2.put("id", IdUtil.getSnowflake(1,1).nextIdStr()); node2.put("type", type); @@ -125,10 +126,12 @@ public class AppRun { nodes.add(node2); } } + if (object.getString("is_delete").equals("1")) { x = x + step + nodeSizeW; continue; } + // 设置节点,只需要struct_id, 自定义参数数据都加载properties对象里面 JSONObject node = new JSONObject(); node.put("id", IdUtil.getSnowflake(1,1).nextIdStr()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index fe5546dba..c7516d023 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -268,8 +268,8 @@ public class StructattrServiceImpl implements StructattrService { JSONObject strInfo = attrTab .query("struct_id = '" + struct_id + "'") .uniqueResult(0); - if (strInfo.getString("is_delete").equals("1")) { - // 被删掉 + if (strInfo.getString("is_used").equals("0")) { + // 被禁用 struct_status = 4; } else if (ObjectUtil.isEmpty(strInfo.getString("storagevehicle_code"))) { // 空位 diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js b/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js index 141f6fe54..9f541d8e4 100644 --- a/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js +++ b/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js @@ -1,11 +1,12 @@ import { HtmlResize } from '@logicflow/extension' import defaultUrl from '../../../image/Empty_state_money.svg' -import vehicle from '../../../image/vehicle.svg' import api from '@/store/modules/api' import rold from '../../../image/rold.svg' -import wood from '../../../image/wood.svg' -import empty from '../../../image/empty.svg' -import ban from '../../../image/ban.svg' +import green from '../../../image/green.svg' +import yellow from '../../../image/yellow.svg' +import grey from '../../../image/grey.svg' +import blue from '../../../image/blue.svg' + class ButtonNodeModel extends HtmlResize.model { initNodeData(data) { super.initNodeData(data) @@ -35,16 +36,16 @@ class ButtonNode extends HtmlResize.view { if (properties.struct_status) { switch (properties.struct_status) { case 1: - imageUrl = vehicle + imageUrl = blue break case 2: - imageUrl = wood + imageUrl = yellow break case 3: - imageUrl = empty + imageUrl = green break case 4: - imageUrl = ban + imageUrl = grey break default: break diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/image/vehicle.svg b/lms/nladmin-ui/src/views/system/logicflow/editor/image/blue.svg similarity index 100% rename from lms/nladmin-ui/src/views/system/logicflow/editor/image/vehicle.svg rename to lms/nladmin-ui/src/views/system/logicflow/editor/image/blue.svg diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/image/wood.svg b/lms/nladmin-ui/src/views/system/logicflow/editor/image/green.svg similarity index 100% rename from lms/nladmin-ui/src/views/system/logicflow/editor/image/wood.svg rename to lms/nladmin-ui/src/views/system/logicflow/editor/image/green.svg diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/image/ban.svg b/lms/nladmin-ui/src/views/system/logicflow/editor/image/grey.svg similarity index 100% rename from lms/nladmin-ui/src/views/system/logicflow/editor/image/ban.svg rename to lms/nladmin-ui/src/views/system/logicflow/editor/image/grey.svg diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/image/empty.svg b/lms/nladmin-ui/src/views/system/logicflow/editor/image/yellow.svg similarity index 94% rename from lms/nladmin-ui/src/views/system/logicflow/editor/image/empty.svg rename to lms/nladmin-ui/src/views/system/logicflow/editor/image/yellow.svg index 77b92c37d..29ace783c 100644 --- a/lms/nladmin-ui/src/views/system/logicflow/editor/image/empty.svg +++ b/lms/nladmin-ui/src/views/system/logicflow/editor/image/yellow.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lms/nladmin-ui/src/views/system/monitor/device/structStage.js b/lms/nladmin-ui/src/views/system/monitor/device/structStage.js index ba6400386..a70e0e623 100644 --- a/lms/nladmin-ui/src/views/system/monitor/device/structStage.js +++ b/lms/nladmin-ui/src/views/system/monitor/device/structStage.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -export function getStructByCodes(data) { // 获取舞台上设备信息 +export function getStructByCodes(data) { // 获取仓位信息 return request({ url: 'api/structattr/getStructByCodes', method: 'post', diff --git a/lms/nladmin-ui/src/views/wms/mnt/ibraryone/index.vue b/lms/nladmin-ui/src/views/wms/mnt/ibraryone/index.vue new file mode 100644 index 000000000..ebaaed711 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/mnt/ibraryone/index.vue @@ -0,0 +1,269 @@ + + + + + +