From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 02 七月 2025 13:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5ce4875..81bdf3d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -22,14 +22,15 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;
+@Slf4j
@Service
public class OpenServiceImpl implements OpenService {
@@ -62,12 +63,12 @@
@Override
public R taskCreate(taskCreateParam param) {
//绂佺敤鍫嗗灈鏈哄悗涓嶅彲涓嬪彂浠诲姟
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", param.getCrn()));
- if ((param.getIoType() == 3 || param.getIoType() == 1 ) && basCrnp.getInEnable().equals("N")){
- throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
- } else if (param.getIoType() == 2 && basCrnp.getOutEnable().equals("N")) {
- throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
- }
+// BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", param.getCrn()));
+// if ((param.getIoType() == 3 || param.getIoType() == 1 ) && basCrnp.getInEnable().equals("N")){
+// throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
+// } else if (param.getIoType() == 2 && basCrnp.getOutEnable().equals("N")) {
+// throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
+// }
//绂佺敤搴撲綅鍚庝笉鍙笅鍙戝嚭搴撲换鍔�
if (param.getIoType() == 2){
String wcsLocNo = Utils.getWcsLocNo(param.getStartPoint());
@@ -94,6 +95,8 @@
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
taskWrk.setCrnNo(param.getCrn());
+ String stats = "";
+ String wcsLocNo = "";
if(param.getIoType() == 1){
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
@@ -105,14 +108,18 @@
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+ wcsLocNo = taskWrk.getStartPoint();
taskWrk.setOriginStartPoint(param.getStartPoint());
+ stats = "R";
}
taskWrk.setTargetPoint(param.getTargetPoint());
}else if (param.getIoType() == 3){
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+ wcsLocNo = taskWrk.getStartPoint();
taskWrk.setOriginStartPoint(param.getStartPoint());
+ stats = "R";
}
}
@@ -121,6 +128,18 @@
if (!Cools.isEmpty(param.getMemo())) {
taskWrk.setMemo(param.getMemo());//澶囨敞
}
+
+ // 鏇存柊搴撲綅鐘舵��,鍏ュ簱杩樻病鍒嗛厤搴撲綅锛屾壂鐮佷箣鍚庢墠鍒嗛厤
+// if (param.getIoType() == 2 || param.getIoType() == 3) {
+// try {
+// LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+// locMast.setLocSts(stats);
+// log.info("-----鍏ュ簱鏇存柊搴撲綅鐘舵�佷负锛歊鎴愬姛----------"+ locMast.getLocNo());
+// locMastService.updateById(locMast);
+// } catch (Exception e){
+// log.error("-----鍑哄簱鏇存柊搴撲綅鐘舵�佷负锛歊寮傚父----------"+ e);
+// }
+// }
if (!taskWrkService.insert(taskWrk)) {
return R.error("鍒涘缓浠诲姟澶辫触");
@@ -138,6 +157,11 @@
list = getInEnableRoadway();
}else {
list = getInEnableRoadway2();
+ }
+
+ if (Cools.isEmpty(list)){
+ log.warn("鏃犲彲鍏ュ贩閬擄紝璇风◢鍚庡啀璇�");
+ return R.error("鏃犲彲鍏ュ贩閬�");
}
@@ -162,7 +186,7 @@
JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wms璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ apiLogService.save("璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
,null
,"127.0.0.1"
@@ -213,13 +237,13 @@
}
@Override
- public void getAgvTaskOver(TaskOverParam param) {
+ public R getAgvTaskOver(TaskOverParam param) {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("stn_desc", param.getWharfCode()));
if (Cools.isEmpty(staDesc)){
- throw new RuntimeException("鏈煡璇㈠埌绔欑偣淇℃伅");
+ throw new CoolException("鏈煡璇㈠埌绔欑偣淇℃伅");
}
// 鑾峰彇鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -237,10 +261,13 @@
staProtocol.setStaNo((short)0);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
-
+ return R.ok("鍙栬揣瀹屾垚");
} else {
- throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
+ throw new CoolException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
}
+ }else {
+ return R.error("鍙栬揣绔欑偣鐘舵�佹湁璇�,鏈夌墿淇″彿锛�"+staProtocol.isLoading()
+ +",杞﹁締淇″彿锛�"+staProtocol.isCar()+",宸ヤ綔鍙凤細"+staProtocol.getWorkNo());
}
}else {
for (DevpSlave.Sta inSta : devp.getInSta()) {
@@ -252,16 +279,20 @@
staProtocol.setStaNo(inSta.getStaNo().shortValue());
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
-
+ return R.ok("鏀捐揣瀹屾垚");
} else {
- throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
+ throw new CoolException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
}
+ }else {
+ return R.error("鏀捐揣绔欑偣鐘舵�佹湁璇�,鏈夌墿淇″彿锛�"+staProtocol.isLoading()
+ +",杞﹁締淇″彿锛�"+staProtocol.isCar()+",宸ヤ綔鍙凤細"+staProtocol.getWorkNo());
}
}
}
}
}
+ return R.ok();
}
@@ -289,8 +320,18 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- if (workNo == 0 && !staProtocol.isLoading()){
+ if (workNo == 0 && !staProtocol.isLoading() && staProtocol.isAutoing()){
if (Cools.isEmpty( map.get(inSta.getStaNo()))){
+ continue;
+ }
+ BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
+ if (Cools.isEmpty(crnp)){
+ continue;
+ }
+ if (crnp.getInEnable().equals("N")){
+ continue;
+ }
+ if (crnp.getCrnSts()!=3){
continue;
}
list.add( map.get(inSta.getStaNo()));
@@ -325,10 +366,20 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- if (workNo == 0 && !staProtocol.isLoading()){
+ if (workNo == 0 && !staProtocol.isLoading() && staProtocol.isAutoing()){
if (Cools.isEmpty( map.get(inSta.getStaNo()))){
continue;
}
+ BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
+ if (Cools.isEmpty(crnp)){
+ continue;
+ }
+ if (crnp.getInEnable().equals("N")){
+ continue;
+ }
+ if (crnp.getCrnSts()!=3){
+ continue;
+ }
list.add( map.get(inSta.getStaNo()));
}
}
--
Gitblit v1.9.1