From 102a41a8d5c231dd306bad622344e98312c1a774 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 02 十二月 2025 10:16:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 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 a8300f7..1ace7d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -721,6 +721,40 @@
@Override
@Transactional
+ public boolean TaskArmLocStatus(ArmOKParam param) {
+ BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
+ .eq("arm_no", param.getArmNo())
+ .eq("sta_no", param.getStaNo())
+ .eq("status", 1)
+ );
+ if (Cools.isEmpty(basArm)){
+ log.error("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ return false;
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
+ if (Cools.isEmpty(locMast)){
+ log.error("鏌ヨ涓嶅埌locMast鏁版嵁锛侊紒锛�"+ JSON.toJSONString(param));
+ return false;
+ }
+ if (locMast.getLocSts().equals("D")){
+ BasArmMast basArmMast = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sta_no", basArm.getStaNoSou())
+ .eq("arm_no", param.getArmNo())
+ .eq("status", 3)
+ );
+ if (Cools.isEmpty(basArmMast)){
+ return true;
+ }
+ log.error("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ } else {
+ log.error("locMast鐘舵�佷笉涓篋锛侊紒锛�"+ JSON.toJSONString(param));
+ }
+ return false;
+ }
+
+ @Override
+ @Transactional
public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
.eq("arm_no", param.getArm_no())
@@ -960,6 +994,7 @@
agvGoParam.setCode("0");
agvGoParam.setMessage("缁х画鎵ц");
agvGoParam.setReqCode(param.getReqCode());
+ agvGoParam.setTaskCode(param.getTaskCode());
ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, agvGoParam);
if (result.getCode()==200){
return true;
@@ -998,10 +1033,10 @@
}
return false;
}else {
- if (basAgvMast.getIoType()==0 && basAgvMast.getStaNo()==2034){
+ if (basAgvMast.getIoType()==0 && (basAgvMast.getStaNo()==2034 || basAgvMast.getStaNo()==4003)){
AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
- agvBindCtnrAndBinTwoParam.setReqCode(basAgvMast.getTaskNo() + "-" + basAgvMast.getTimestamp());
- agvBindCtnrAndBinTwoParam.setPodCode(basAgvMast.getBarcode());
+ agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
+ agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getStaNo().toString());
agvBindCtnrAndBinTwoParam.setIndBind("0");;
ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦",
--
Gitblit v1.9.1