From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 7ea6bfb..0134534 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -159,14 +159,6 @@
if(code == 0){
for(AgvWrkMast agvWrkMast : agvWrkMastList){
- //涓嬪彂瀹瑰櫒杈惧埌閫氱煡 锛堣緭閫佺嚎锛�
- if("Y".equals(agvWrkMast.getMk())){
- int containerArrivedCode = agvWrkMastService.containerArrived(agvWrkMast);
- if(containerArrivedCode != 0){
- log.error("瀹瑰櫒鍒拌揪鎸囦护涓嬪彂澶辫触");
- continue;
- }
- }
//202.RCS鍙栬揣涓�
agvWrkMast.setWrkSts(202L);
agvWrkMastService.updateById(agvWrkMast);
@@ -182,11 +174,11 @@
@Transactional
public ReturnT<String> startCarryWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
- log.info(agvWrkMastList.toString());
+ //log.info(agvWrkMastList.toString());
//浠诲姟杩囨护锛岃繃婊ゆ帀宸插瓨鍦ㄧ浉鍚岀洰鏍囧簱浣嶇殑宸ヤ綔妗�
- agvWrkMastList = filter(agvWrkMastList);
+ //agvWrkMastList = filter(agvWrkMastList);
int code = agvWrkMastService.startWrk(agvWrkMastList,"carry");
- log.info(agvWrkMastList.toString());
+ //log.info(agvWrkMastList.toString());
if (Cools.isEmpty(agvWrkMastList)){
return SUCCESS;
}
--
Gitblit v1.9.1