From 52ad49fed7108445edc8178a98cf4cca36fe0eb0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 十一月 2025 19:54:33 +0800
Subject: [PATCH] agv相关接口流程修改
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 0c71b66..b136ed2 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -88,6 +88,9 @@
private BasRgvMapService basRgvMapService;
@Resource
+ private BasDevpMapper basDevpMapper;
+
+ @Resource
private BasDevpErrLogService basDevpErrLogService;
@Value("${wms.url}")
@@ -614,6 +617,10 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
News.error(""+mark+" - 1"+" - 17"+" - 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
+ // 鍏ュ簱鏆傚瓨鏁�-1
+ int sourceStaNo = wrkMast.getSourceStaNo();
+ sourceStaNo = (sourceStaNo > 1024) ? sourceStaNo + 1 : sourceStaNo - 1;
+ basDevpMapper.decrementInQty(sourceStaNo);
}
}
News.infoNoLog(""+mark+" - 1"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 锛� 鍏ュ簱鎵ц瀹屾瘯");
@@ -1421,6 +1428,22 @@
}
}
+ public synchronized void forwardAGVInTasks() {
+ List<Integer> workNos = new ArrayList<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ for (DevpSlave.Sta agvSta : devp.getOutSta()) {
+ StaProtocol staProtocol = devpThread.getStation().get(agvSta.getStaNo());
+ if (staProtocol != null && staProtocol.getWorkNo() != 0) {
+ workNos.add(staProtocol.getWorkNo());
+ }
+ }
+ }
+ if (!workNos.isEmpty()) {
+ wrkMastMapper.updateCallAgvBatch(workNos);
+ }
+ }
+
/**
* 鍥犲弻娣卞簱浣嶉樆濉烇紝瀵规祬搴撲綅杩涜绉昏浆锛堢珛鍗虫墽琛岀増)
* tip锛氬悓姝�
--
Gitblit v1.9.1