From 027db7231eb168c0bafab979dd347ff59ee7f2a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 15 九月 2023 16:31:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
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 f0fa53a..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,9 +158,11 @@
int tiers;
int prctier;
-
+ spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟
Glass glasslist = spianMapper.selectGlass(glassid);
-
+ if(glasslist==null){
+ return (300);
+ }
double widths = glasslist.getWidth();
Short orderids = glasslist.getOrderId();
@@ -206,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);
}
}
@@ -229,7 +232,6 @@
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut2(glassid);
-
if(cageout==null){
return (300);
}
@@ -365,3 +367,4 @@
// }
}
+
--
Gitblit v1.8.0