From 2cffc71ef5964efcdf5ea2dead4fb8a582688d4c Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 07 二月 2024 13:55:30 +0800
Subject: [PATCH] Changes
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index b7ef1bb..cc8f205 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);
- agvWrkMast.setLocNo(param.getLocationCode());
+ //agvWrkMast.setLocNo(param.getLocationCode());
agvWrkMastService.updateById(agvWrkMast);
//agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b84aa9c..2b2ab28 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -644,10 +644,10 @@
String currentContainerCode = currentContainerMap.get(devNo);
//鍒ゆ柇瀹瑰櫒鏄惁鍙戠敓鍙樺寲
- if(!Cools.eq(containerCode,currentContainerCode)){
+ if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
//鏌ヨ鏃у鍣ㄧ殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
- if(Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
+ if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
//鍙戦�佸鍣ㄧ珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
agvWrkMastList.add(agvWrkMast);
@@ -682,7 +682,7 @@
//鏌ユ壘璇ュ鍣ㄧ殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
if(!Cools.isEmpty(agvWrkMast)){
- return R.ok(agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo()));
+ return R.ok(agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkMast.getWrkNo())));
}
//鏌ユ壘璇ュ鍣ㄧ殑鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
--
Gitblit v1.9.1