From 3fd78eacff528f59e625be99ebadfb7609c8f265 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 21 六月 2024 14:36:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 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 a1284f4..99755c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -34,13 +34,11 @@
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.cpmmandParam.CrnCommandParam;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.JarProtocol;
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 com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -107,11 +105,14 @@
private WrkMastCrnMapper wrkMastCrnMapper;
@Autowired
private WrkMastSplitTwinMapper wrkMastSplitTwinMapper;
+ @Autowired
+ private WrkMastSplitTwinService wrkMastSplitTwinService;
+ @Autowired
+ private BasJarMastService basJarMastService;
@Value("${wms.url}")
private String wmsUrl;
- @Autowired
- private WrkMastSplitTwinService wrkMastSplitTwinService;
+
/**
* 缁勬墭
@@ -4409,12 +4410,45 @@
* Jar浠诲姟鍒涘缓
*/
public synchronized void jarGenerateWrkMastSta() {
- try{
-
- }catch (Exception e){
- log.error("灏忚溅澶嶄綅绾跨▼鎶ラ敊锛�"+e);
+ for (JarSlave jarSlave : slaveProperties.getJar()) {
+ try{
+ Integer count = basJarMastService.getJarMastByJarIdCount(jarSlave.getId().longValue());
+ if (count>=7){
+ continue;
+ }
+ BasJarMast jarMastByJarIdMax = basJarMastService.getJarMastByJarIdMax(jarSlave.getId().longValue());
+ if (jarMastByJarIdMax.getJarLocDigit()==7){
+ continue;
+ }
+ jarGenerateWrkMastStaExecute(jarSlave);
+ }catch (Exception e){
+ log.error(jarSlave.getId()+"鍙峰皬杞﹀浣嶇嚎绋嬫姤閿欙紒"+e);
+ }
}
}
+
+ /**
+ * Jar浠诲姟鍒涘缓 鎵ц
+ */
+ public synchronized boolean jarGenerateWrkMastStaExecute(JarSlave jarSlave) {
+ try{
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ JarThread jarThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getId());
+ JarProtocol jarProtocol = jarThread.getJarProtocol();
+ if (jarProtocol == null) {
+ return false;
+ }
+ if (jarProtocol.modeType != JarModeType.AUTO){
+ return false;
+ }
+ // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
+
+ } catch (Exception e){
+// log.error("鍫嗗灈鏈哄伐浣嶄簩瀹屾垚绛夊緟纭寮傚父,鍫嗗灈鏈哄彿={},寮傚父淇℃伅={},宸ヤ綅鍙�={}",crn.getId(),e.getMessage(),2);
+ }
+ return false;
+ }
+
/**
* Jar浠诲姟鎵ц
@@ -4499,7 +4533,7 @@
return false;
}
/*
- * 灏忚溅鍙栫┖鏉胯嚦宸ヤ綅浠诲姟 婊″彇
+ * 绌挎鏉跨Щ鍔�
* */
public synchronized boolean jarRgvTake8(Integer rgvId,BasJarMast basJarMast){
return false;
--
Gitblit v1.9.1