From 7d7a2c1b4a8f4c0ce412916cf8acba3510e3ba05 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期一, 08 十二月 2025 17:21:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 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 8c6dc95..eca924f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1242,6 +1242,20 @@
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
+ public synchronized void taskCreate() {
+ for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
+ try {
+ for (RgvSlave.RgvStn inSta : rgvSlave.getRgvInSta()) {
+ boolean create = deviceDetectionCreate(inSta);
+ if (create) {
+ continue;
+ }
+ }
+ } catch (Exception e){
+
+ }
+ }
+ }
public synchronized void taskStart() {
for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
try {
@@ -1724,6 +1738,32 @@
return true;
}
+ public boolean deviceDetectionCreate(RgvSlave.RgvStn inSta) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, inSta.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ return false;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
+ if (staProtocol.isAutoing()
+// && staProtocol.isLoading()
+// && staProtocol.isStaOk()
+ && staProtocol.getWorkNo() != 0) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(staProtocol.getWorkNo());
+ if (Cools.isEmpty(taskWrk)){
+ if (inSta.getStaNo()==117 || inSta.getStaNo()==120 || inSta.getStaNo()==123
+ || inSta.getStaNo()==217 || inSta.getStaNo()==220 || inSta.getStaNo()==223){
+ WrkMast wrkMast = wrkMastService.selectByWrkNo(staProtocol.getWorkNo());
+ if (!Cools.isEmpty(wrkMast) && wrkMast.getIoType()<100){
+ return true;
+ }
+ } else {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
public TaskWrk deviceDetection(RgvSlave.RgvStn inSta) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, inSta.getDevpPlcId());
@@ -1741,7 +1781,7 @@
// && staProtocol.isLoading()
// && staProtocol.isStaOk()
&& staProtocol.getWorkNo() != 0) {
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo());
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(staProtocol.getWorkNo());
if (taskWrk != null) {
Integer stano = staProtocol.getStaNo().intValue();
if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
@@ -1859,7 +1899,7 @@
// 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
if (staProtocolOther.isAutoing()
&& staProtocolOther.getWorkNo() != 0) {
- TaskWrk taskWrkOther = taskWrkService.selectByWrkNo(staProtocolOther.getWorkNo());
+ TaskWrk taskWrkOther = taskWrkService.selectByTaskNo(staProtocolOther.getWorkNo());
if (taskWrkOther != null) {
return taskWrkOther;
}
--
Gitblit v1.9.1