From 73e45cf5411a9530418b87e3368289bb2a8b5042 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 16 九月 2023 17:10:25 +0800
Subject: [PATCH] mes测试更改，增加调拨后自动再判断出片
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 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 131cd1b..5573950 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
@@ -36,23 +36,21 @@
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�
- try {
- Glass glass = jdbcConnections.selectGlass(112);
+ // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
+ // try {
+ // Glass glass = jdbcConnections.selectGlass(112);
- // System.out.println(glass.getOrderId());
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- // spianService.selectout("11");
-
- // 鍒ゆ柇杩涚墖璇锋眰
+ // // System.out.println(glass.getOrderId());
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
+
+ //鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);
-
+
if (datas1List != null && datas1ListState != null) {
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
boolean exist = datas1List.contains((short) 1);
@@ -60,9 +58,9 @@
boolean exist1 = datas1ListState.contains((short) 0);
String glassid="";
// 杩涚墖璇锋眰涓�1鏃�
- if (exist = true) {
+ if (exist == true) {
// 褰撹繘鐗囪溅绌洪棽鏃�
- if (exist1 = true) {
+ if (exist1 == true) {
// 鑾峰彇杩涚墖id
List<Short> datas1ListID = S7control.getinstance().ReadWord("DB106.26", 13);
if (datas1ListID != null) {
@@ -80,23 +78,31 @@
}
//spianService.selectAll((short) 111);
-
+
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
- //List<Short> outlist2 = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖浠诲姟瀹屾垚
-
-
- if (outlist != null) {
+ boolean outstate=false;//鍑虹墖杞︾┖闂插垽鏂�
+ if (outlist != null) {
// 鍒ゆ柇鎸夎鍗曞嚭鐗�
- boolean outstate = outlist.contains((short) 0);
-
- if (outstate = true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
+ outstate = outlist.contains((short) 0);
+ }
+ Glass glass=spianMapper.SelectDBOut();//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
+
+ if(outstate== true ){
+ if(glass.getId()==2){
+ spianService.selectout2(glass.getGlassId().toString());
+ }
+ }
+
+
+
+ if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
String orderid = spianMapper.SelectOrderout();
if (orderid != null) {
spianService.selectout(orderid);
}
}
- }
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0