From 97c6a268766387d9c6834c23c9da3fdf63f3dc3f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 07 二月 2024 11:26:48 +0800
Subject: [PATCH] Changes
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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 c98b79c..964f52f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -45,9 +45,6 @@
@Value("${agv.containerArrivedPath}")
private String containerArrivedPath;
- @Value("${agvBasDev.maxWorkNum}")
- private int maxWrokNum;
-
@Autowired
AgvWrkMastMapper agvWrkMastMapper;
@Autowired
@@ -76,9 +73,6 @@
}
public int startWrk(List<AgvWrkMast> agvWrkMastList, String taskType) throws IOException {
-
- //浠诲姟杩囨护锛岃繃婊ゆ帀宸插瓨鍦ㄧ浉鍚岀洰鏍囧簱浣嶇殑宸ヤ綔妗�
- agvWrkMastList = filter(agvWrkMastList);
AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
agvTaskCreateParam.setTaskType(taskType);
@@ -154,13 +148,6 @@
return this.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode));
}
- private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList){
- return agvWrkMastList.stream().filter(agvWrkMast -> {
- int num = this.selectCount(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvWrkMast.getLocNo()));
- return num <= maxWrokNum;
- }).collect(Collectors.toList());
- }
-
private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
//寰�瀹瑰櫒鍏ュ満鍙傛暟涓斁鍏ユ簮绔欑偣浣嶇疆
for(AgvWrkMast agvWrkMast : agvWrkMastList){
@@ -192,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