From a0dc6d318064e45557bf2426a8f3064dbd23d93e Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 15:25:45 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
index 547cedb..d03e191 100644
--- a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
@@ -20,13 +20,23 @@
@Transactional
public ReturnT<String> start() {
try {
+ // 涓嬩綅鏈哄懡浠よ浆鍘嗗彶妗�
int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
if (updateCount > 0) {
int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
- if (deleteCount <= 0) {
- exceptionHandle("鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。閿欒 ! ");
- }
+// if (deleteCount <= 0) {
+// exceptionHandle("鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。閿欒 ! ");
+// }
}
+
+// //鏉＄爜缁勬墭鏁版嵁杞巻鍙叉。 2021-09-10 TQS ADD
+// int updateBarcodeCount = jdbcTemplate.update("insert into asr_plt_barcode_log select * from asr_plt_barcode where io_status>=2;");
+// if (updateBarcodeCount > 0) {
+// int deleteBarcodeCount = jdbcTemplate.update("delete from asr_plt_barcode where io_status>=2;");
+// if (deleteBarcodeCount <= 0) {
+// exceptionHandle("鏉＄爜缁勬墭鏁版嵁杞巻鍙叉。閿欒 ! ");
+// }
+// }
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1