From bda52da89628d1587ab804510f9995c671a318ca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 14:49:19 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 11 ++++++-----
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 23 +++++++++++++++++------
2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
index 6b8cdd5..d020f2a 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -71,18 +71,29 @@
mesh.name = item.locNo;
mesh.traverse(function (child) {
if (child.isMesh) {
- if (child.name === '涓嶈鍒�') {
- // child.visible = false;
- child.material.color.set(0xE8B67E);
- }
if (child.name === '璐ф灦') {
- // child.visible = false;
child.material.color.set(0x4680BF);
}
+ let palletVisible = true, cargoVisible = true;
+ switch (item.locSts) {
+ case 'D':
+ cargoVisible = false;
+ break;
+ case 'O':
+ palletVisible = false;
+ cargoVisible = false;
+ break;
+ default:
+ break;
+ }
if (child.name === '鎵樼洏') {
- // child.visible = false;
+ child.visible = palletVisible;
child.material.color.set(0xBEBEBE);
}
+ if (child.name === '涓嶈鍒�') {
+ child.visible = cargoVisible;
+ child.material.color.set(0xE8B67E);
+ }
child.name = item.locNo
child.castShadow = true;
child.receiveShadow = true;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
index a46a9df..94a8a55 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
@@ -15,10 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
/**
* Created by vincent on 3/15/2024
@@ -84,8 +81,12 @@
List<LocVo> locVos = new ArrayList<>();
int row = Utils.getRow(locNo);
int bay = Utils.getBay(locNo);
+
+
+ String[] statusOptions = {"F", "D", "O"};
+ Random random = new Random();
for (int lev = 1; lev < 6; lev++) {
- locVos.add(new LocVo(Utils.getLocNo(row, bay, lev), "F"));
+ locVos.add(new LocVo(Utils.getLocNo(row, bay, lev), statusOptions[random.nextInt(statusOptions.length)]));
}
return locVos;
}
--
Gitblit v1.9.1