From 393656492f8238c48d93f145bf970af39d8cef48 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 31 十月 2024 15:07:37 +0800
Subject: [PATCH] 出库呼叫agv
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 5388b89..cabc0e1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -31,17 +31,17 @@
import com.zy.core.enums.DevpType.DevpStateType;
import com.zy.core.enums.DevpType.DevpTrayType;
import com.zy.core.enums.DevpType.DevpWorkType;
-import com.zy.core.model.*;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
+import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.LedCommand;
-import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.CrnProtocol;
-import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
-import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,6 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -2122,7 +2121,7 @@
if (staProtocol.getWorkNo() != 0){
continue;
}
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()).eq("wrk_sts", 101).in("crn_no", 8, 9));
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()).eq("wrk_sts", 101));
if(!Cools.isEmpty(wrkMast1)){
continue;
}
@@ -2130,9 +2129,8 @@
//鏌ヨ鐘舵�佷负2鐨勪换鍔�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("wrk_no", staProtocol.getWorkNo())
- .in("io_type",1,10,53,54,57)
- .in("wrk_sts", 2,104)
- .in("crn_no",8,9));
+ .in("io_type",101,110,103,104,107)
+ .eq("wrk_sts", 15));
if (Cools.isEmpty(wrkMast)) {
log.error(agvSta.getStaNo()+"绔�,杞彂agv浠诲姟鏈壘鍒板搴斾换鍔�,浠诲姟鍙凤細"+staProtocol.getWorkNo());
continue;
@@ -2161,17 +2159,18 @@
//璧峰浣�
new ForwardAGVTaskParam.PositionCodePaths(staNo.toString(),"05"),
//鐩爣浣�
- new ForwardAGVTaskParam.PositionCodePaths(param.getLocNo(),"05")
+ new ForwardAGVTaskParam.PositionCodePaths("a3","05")
);
Date date = new Date();
DecimalFormat df = new DecimalFormat("0000");
String wrkNo = "Crn"+df.format(param.getWrkNo())+date.getTime()/1000;
agvTaskCreateParam.setReqCode(wrkNo);
agvTaskCreateParam.setReqTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
- agvTaskCreateParam.setTaskTyp("GT1");
+ agvTaskCreateParam.setTaskTyp("GT4");
agvTaskCreateParam.setCtnrCode(param.getBarcode());
agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
- agvTaskCreateParam.setCtnrTyp("1");
+ agvTaskCreateParam.setCtnrTyp("2");
+ agvTaskCreateParam.setPriority("1");
agvTaskCreateParam.setTaskCode(wrkNo);
}
--
Gitblit v1.9.1