From 8257d89c461f6553d66fad1e5e3df3d172a00924 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 29 十一月 2025 18:10:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 7b710b1..d402788 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -706,7 +706,8 @@
.eq("status", 1)
);
if (Cools.isEmpty(basArmMast)){
- throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ return;
+// throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
if (Integer.parseInt(param.getPick_num()) !=1){
basArmMast.setStatus(9);
@@ -871,23 +872,18 @@
agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
agvBindCtnrAndBinParam.setCtnrTyp("1");
- agvBindCtnrAndBinParam.setPositionCode(
- basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null
- ? basAgvLocNoSou.getAgvLocNo()
- : ""
- );
- agvBindCtnrAndBinParam.setStgBinCode(
- basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null
- ? basAgvLocNoEnd.getAgvLocNo()
- : ""
- );
+ if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
+ }
+ if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
+ }
agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
try {
String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
String mesPath = "bindCtnrAndBin"; // 鎺ュ彛璺緞
String response = "";
boolean success = false;
-
try {
log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
@@ -928,6 +924,45 @@
return false;
}
+ @Override
+ @Transactional
+ public boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param) {
+ String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
+ String AGVPath = "continueTask"; // 鎺ュ彛璺緞
+ AgvGoParam agvGoParam = new AgvGoParam();
+ agvGoParam.setCode("0");
+ agvGoParam.setMessage("缁х画鎵ц");
+ agvGoParam.setReqCode(param.getReqCode());
+ ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, param);
+ if (result.getCode()==200){
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ @Transactional
+ public boolean agvBindAndBin(String taskNo) {
+ String URL = "http://10.10.10.200:8181/"; // AGV鎺ュ彛鍦板潃
+ String AGVPath = "rcms/services/rest/hikRpcService/bindCtnrAndBin"; // 鎺ュ彛璺緞
+ BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",taskNo));
+ BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
+ new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
+ );
+ AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+ agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + basAgvMast.getTimestamp());
+ agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
+ agvBindCtnrAndBinParam.setCtnrTyp("1");
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
+ agvBindCtnrAndBinParam.setIndBind("0");
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦", URL,AGVPath, agvBindCtnrAndBinParam);
+ if (resultBind.getCode()!=200){
+ return true;
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.1