From e8e24655f90134400f6a90c507f13eb91d3813de Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 25 十二月 2025 15:11:13 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 ++++--
src/main/java/com/zy/core/MainProcess.java | 28 +++++++-------
src/main/webapp/views/deviceOperate/crnOperate.html | 36 +++++++++---------
3 files changed, 40 insertions(+), 37 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 08bb993..e75980e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -703,12 +703,15 @@
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
+ if (!staProtocol.isAutoing() || staProtocol.isLoading()) {
+ continue;
+ }
+ TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnProtocol.getLaneNo(), staDesc.getStnNo().toString());
+ if (taskWrk == null) {
+ continue;
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0 || staProtocol.getWorkNo().equals(taskWrk.getWrkNo()))) {
// 鏌ヨ宸ヤ綔妗�
- TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnProtocol.getLaneNo(), staDesc.getStnNo().toString());
- if (taskWrk == null) {
- continue;
- }
log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk));
// R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
staProtocol.setWorkNo(taskWrk.getWrkNo());
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 96bd4f2..5251183 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -23,9 +23,9 @@
// 鎵�灞炵嚎绋�
private Thread thread;
private Thread thread2;
- private Thread thread3;
- private Thread thread4;
- private Thread thread5;
+// private Thread thread3;
+// private Thread thread4;
+// private Thread thread5;
/**
* =====>> 寮�濮嬪伐浣�
@@ -37,14 +37,14 @@
thread2 = new Thread(this::crnAndDevOtherRun);
thread2.start();
- thread5 = new Thread(this::demoRun5);
- thread5.start();
-
- thread3 = new Thread(this::demoRun);
- thread3.start();
-
- thread4 = new Thread(this::demoOpenRun);
- thread4.start();
+// thread5 = new Thread(this::demoRun5);
+// thread5.start();
+//
+// thread3 = new Thread(this::demoRun);
+// thread3.start();
+//
+// thread4 = new Thread(this::demoOpenRun);
+// thread4.start();
}
private void crnAndDevRun() {
@@ -213,9 +213,9 @@
public void shutDown() {
if (thread != null) thread.interrupt();
if (thread2 != null) thread2.interrupt();
- if (thread3 != null) thread3.interrupt();
- if (thread4 != null) thread4.interrupt();
- if (thread5 != null) thread5.interrupt();
+// if (thread3 != null) thread3.interrupt();
+// if (thread4 != null) thread4.interrupt();
+// if (thread5 != null) thread5.interrupt();
}
}
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 874abdf..387c0ae 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -75,21 +75,21 @@
</el-form-item>
</el-form>
<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="娴嬭瘯搴撲綅鏁伴噺">
- <el-input v-model="formParam.locMastDemoCount" placeholder="娴嬭瘯搴撲綅鏁伴噺"></el-input>
- </el-form-item>
- <el-form-item label="鍘熷鍑哄簱搴撲綅">
- <el-input v-model="formParam.locMastDemoF" placeholder="鍘熷鏈夌墿搴撲綅"></el-input>
- </el-form-item>
- <el-form-item label="鍘熷绌哄簱浣�">
- <el-input v-model="formParam.locMastDemoE" placeholder="鍘熷鏃犵墿搴撲綅"></el-input>
- </el-form-item>
- <el-form-item label="鍫嗗灈鏈烘斁璐х珯鐐�">
- <el-input v-model="formParam.staOutDemo" placeholder="鍫嗗灈鏈烘斁璐х珯鐐�"></el-input>
- </el-form-item>
- <el-form-item label="鍫嗗灈鏈哄彇璐х珯鐐�">
- <el-input v-model="formParam.staIntDemo" placeholder="鍫嗗灈鏈哄彇璐х珯鐐�"></el-input>
- </el-form-item>
+<!-- <el-form-item label="娴嬭瘯搴撲綅鏁伴噺">-->
+<!-- <el-input v-model="formParam.locMastDemoCount" placeholder="娴嬭瘯搴撲綅鏁伴噺"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍘熷鍑哄簱搴撲綅">-->
+<!-- <el-input v-model="formParam.locMastDemoF" placeholder="鍘熷鏈夌墿搴撲綅"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍘熷绌哄簱浣�">-->
+<!-- <el-input v-model="formParam.locMastDemoE" placeholder="鍘熷鏃犵墿搴撲綅"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍫嗗灈鏈烘斁璐х珯鐐�">-->
+<!-- <el-input v-model="formParam.staOutDemo" placeholder="鍫嗗灈鏈烘斁璐х珯鐐�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍫嗗灈鏈哄彇璐х珯鐐�">-->
+<!-- <el-input v-model="formParam.staIntDemo" placeholder="鍫嗗灈鏈哄彇璐х珯鐐�"></el-input>-->
+<!-- </el-form-item>-->
</el-form>
<el-form label-position="top" :inline="true" class="demo-form-inline">
<el-form-item label="">
@@ -98,9 +98,9 @@
<el-form-item label="">
<el-checkbox @change="updateEnableInOut('out')" v-model="enableOut">鍙嚭</el-checkbox>
</el-form-item>
- <el-form-item label="">
- <el-checkbox @change="updateDemo('demo')" v-model="hpMkDemo">婕旂ず</el-checkbox>
- </el-form-item>
+<!-- <el-form-item label="">-->
+<!-- <el-checkbox @change="updateDemo('demo')" v-model="hpMkDemo">婕旂ず</el-checkbox>-->
+<!-- </el-form-item>-->
</el-form>
<div>
<!-- <el-button @click="requestOperate('put')" type="primary">鍏ュ簱</el-button>-->
--
Gitblit v1.9.1