From e4e6c1a0e34cbd5aca446018d19166497d8d7814 Mon Sep 17 00:00:00 2001
From: admin <52323@qq.com>
Date: 星期五, 15 九月 2023 11:38:12 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 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 1e678c9..542e0df 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
@@ -82,10 +82,10 @@
List<Short>ceshi2=new ArrayList<Short>();//鍑虹墖浠诲姟瀹屾垚
ceshi1.add((short)0);
ceshi2.add((short)1);
- if(ceshi1!=null && ceshi2!=null){
+ if(outlist!=null && outlist2!=null){
//鍒ゆ柇鎸夎鍗曞嚭鐗�
- boolean outstate = ceshi1.contains((short)0);
- boolean outstate2 = ceshi1.contains((short)1);
+ boolean outstate = outlist.contains((short)0);
+ boolean outstate2 = outlist2.contains((short)1);
if(outstate=true){ //鍑虹墖杞︾姸鎬佺┖闂叉椂
if(outstate2=true){ //鍑虹墖杞︿换鍔″畬鎴愭椂
String orderid=spianMapper.SelectOrderout();
--
Gitblit v1.8.0