From b801ccf0a01277b0796ee6f822346836e33de148 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 十一月 2023 14:55:46 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 12 +-----------
1 files changed, 1 insertions(+), 11 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 734d847..fd4717c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -162,10 +162,9 @@
agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
//AgvTaskkDescribeParam
- if(agvWrkMast.getSourceLocNo().contains("C")){
+ if(agvWrkMast.getSourceLocNo().contains("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
}
- agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
return agvTaskParam;
@@ -208,15 +207,6 @@
);
}
- }
-
- public static void main(String[] args) {
- String locationCode = "301-1";
- if(locationCode.contains("C")){
- System.out.println(true);
- }else {
- System.out.println(false);
- }
}
}
--
Gitblit v1.9.1