From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 十二月 2023 11:42:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 28 +++-------------------------
1 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 89da29c..93b5f3b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -1,16 +1,8 @@
package com.example.springboot.component;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Base64;
import java.util.List;
-
-import org.apache.ibatis.javassist.compiler.ast.Symbol;
import org.springframework.beans.factory.annotation.Autowired;
-
import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianService;
-import com.example.springboot.entity.Glass;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.SpianMapper;
@@ -23,7 +15,7 @@
private JdbcConnections jdbcConnections;
private SpianMapper spianMapper;
private SpianService spianService;
-
+
@Override
public void run() {
boolean inglassbegin = false;
@@ -39,20 +31,6 @@
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
-// List<String> adddresslist = new ArrayList<>();
-// adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
-// adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
-// adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹�
-// adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
-// adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
-// List<Short> datas = new ArrayList<>();
-// datas.add((short) 1000);//璧峰浣嶇疆
-// datas.add((short) 5);//鐩爣浣嶇疆
-// datas.add((short) 610);//杩涚墖鐜荤拑瀹�
-// datas.add((short) 1); //鐜荤拑鏁�
-// spianService.outmesid("123321","DB105.20");
-// datas.add((short) 1);//浠诲姟鍚姩
-// S7control.getinstance().WriteWord(adddresslist, datas);
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
// north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
@@ -161,7 +139,7 @@
outglassbegin = false;
}
- if (outstate == true & glass.getbarcode() != null) { // 褰撳嚭鐗囪溅绌洪棽涓旀湁鍑虹墖浠诲姟寰呭畬鎴愭椂
+ if (outstate == true & glass.getbarcode() != null&&Plchome.isAllowQueue==true) { // 褰撳嚭鐗囪溅绌洪棽涓旀湁鍑虹墖浠诲姟寰呭畬鎴愭椂
// 鍒ゆ柇鏈変袱涓嚭鐗囨垨璋冩嫧浠诲姟鏃跺苟涓斿嚭鐗噄d鍜屾湭瀹屾垚鐨勫嚭鐗囦换鍔d涓嶄竴鏍锋椂鎵ц鍑虹墖
if (!writedstrIdOut.toString().equals(glass.getbarcode().toString())) {
spianService.selectout2(glass.getbarcode().toString());
@@ -171,7 +149,7 @@
// 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
int outnum = spianMapper.SelectOutSliceshu();
// 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
- if (outnum == 0 && outstate == true) {
+ if (outnum == 0 && outstate == true&&Plchome.isAllowQueue==true) {
// 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
String outglassid = spianMapper.SelectOutSlice();
if (outglassid != null) {
--
Gitblit v1.8.0