From 161ae31d54b19f1472951f5f3d2a581bc8f45728 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 15 九月 2023 08:09:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 8 ++++----
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 6 +++---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 7 ++++---
3 files changed, 11 insertions(+), 10 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();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index 877b813..0e063ea 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -16,10 +16,10 @@
e.printStackTrace();
}
- // List<Short> plclist = S7control.getinstance().ReadWord("DB103.DBW0", 10);
- Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
- 1, 0, };
- List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+ List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
+ // Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+ // 1, 0, };
+ // List<Short> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
List<String> Intlist = new ArrayList<>();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 8b4729a..942e6dd 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -158,7 +158,7 @@
int tiers;
int prctier;
-
+ spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟
Glass glasslist = spianMapper.selectGlass(glassid);
if(glasslist==null){
return (300);
@@ -208,9 +208,10 @@
// 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
spianMapper.UpdataAddCage1(widths, cage1, cells);//鍑忓皯鏍煎瓙瀹藉害
- spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟
+
S7control.getinstance().WriteWord(adddresslist, datas);
-
+ S7control.getinstance().WriteWord("DB106.10", (short)0); //杩涚墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.8", (short)1); //杩涚墖杞︾姸鎬佹敼鎴愬繖纰�
return (200);
}
}
--
Gitblit v1.8.0