From 6a3d53b9195e15583af25322afa25de39be183a6 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 06 三月 2024 11:22:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ++-
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 3 +++
src/main/webapp/views/login.html | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 45c054d..b9e7c04 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -119,7 +119,7 @@
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMast.setWrkSts(205L);
- if(param.getLocationCode().contains("@")){
+ if(param.getLocationCode().contains("@") && param.getLocationCode().contains("CS")){
agvWrkMast.setLocNo(param.getLocationCode());
}
//agvWrkMast.setLocNo(param.getLocationCode());
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 163d97b..354b926 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -96,7 +96,8 @@
boolean hasContainerCode = false;
int containerCodeCount = 0;//鏂欑鐮佹暟閲�
for (CombParam.CombMat combMat : param.getCombMats()) {
- if (combMat.getContainerCode() != null) {
+ if(!Cools.isEmpty(combMat.getContainerCode())){
+ //if (combMat.getContainerCode() != null) {
hasContainerCode = true;
containerCodeCount++;
continue;
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 76c58fc..f76b911 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -577,6 +577,7 @@
*/
@PostMapping("/start")
@ResponseBody
+ @Transactional
public R start(@RequestBody ReplenishmentParam param){
log.info("start param: " + param.toString());
String containerCode = param.getContainerCode();
@@ -631,6 +632,8 @@
@ResponseBody
public R move(@RequestBody ReplenishmentParam param){
+ log.info("current containerCode: " + param.toString());
+
if(Cools.isEmpty(currentContainerMap)){
currentContainerMap = new HashMap<>();
}
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 295f9c6..d3e0aa5 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -60,7 +60,7 @@
</p>
<p class="p-sketch-outline__description">wms made with various simple objects.</p>
</div>
- <canvas class="p-canvas-webgl" id="canvas-webgl"></canvas>
+<!-- <canvas class="p-canvas-webgl" id="canvas-webgl"></canvas>-->
</div>
<!-- 渚ц竟鏍� -->
<div id="sidebar">
--
Gitblit v1.9.1