From 22a51a35a7367bc5569ea075afe0b7f1c438b529 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期二, 20 二月 2024 11:10:23 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 66d1b6e..964f52f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -143,6 +143,11 @@
//return this.baseMapper.selectReadyAgvWrkMast();
}
+ @Override
+ public AgvWrkMast selectByContainerCode(String containerCode) {
+ return this.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode));
+ }
+
private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
//寰�瀹瑰櫒鍏ュ満鍙傛暟涓斁鍏ユ簮绔欑偣浣嶇疆
for(AgvWrkMast agvWrkMast : agvWrkMastList){
@@ -174,7 +179,12 @@
if(agvWrkMast.getSourceLocNo().contains("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
}
- agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
+
+ if(agvWrkMast.getLocNo().contains("SK")){
+ agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
+ }else {
+ agvTaskkDescribeParam.setToStationCode(agvWrkMast.getLocNo());
+ }
agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
return agvTaskParam;
}).collect(Collectors.toList());
--
Gitblit v1.9.1