From 733aaaac3ed6a41b78f74c0bcb4d5de7725d788c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 15 一月 2024 16:32:02 +0800
Subject: [PATCH] 更新已有未完成任务提示

---
 springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
index 100ac98..a6d32b8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
@@ -6,11 +6,9 @@
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoProperties.Storage;
 import org.springframework.stereotype.Service;
 
 import com.example.springboot.common.Result;
-import com.example.springboot.component.S7control;
 import com.example.springboot.entity.Out_slice;
 import com.example.springboot.entity.StorageCage;
 import com.example.springboot.mapper.HomeMapper;
@@ -26,8 +24,6 @@
   @Autowired
   SpianService spianService;
 
-  @Autowired
-  private JdbcConnections jdbcConnections;
 
   public void AddOutSliceS(String[][] AluminumFrames) throws SQLException {
     // int sequence = homeMapper.SelectMaxSquence();
@@ -70,6 +66,16 @@
     return Result.success(map);
   }
 
+  // 纭鍚庡畬鎴愪慨鏀瑰嚭鐗囬槦鍒楃姸鎬�
+  public void CompleteQueueByGlassId(String glassid) {
+    homeMapper.CompleteQueueByGlassId(glassid);
+    Out_slice outslice=homeMapper.SelectQueueByglassid(glassid);
+    Short num = homeMapper.SelectCountByFrameNo(outslice.getBarCode());
+    if (num == 0) {
+      homeMapper.CompleteQueueByFrameNo(outslice.getBarCode());
+    }
+  }
+
   //缁堟杩涚墖/鍑虹墖
   public void StopTask(String glassid, int i) {
     if (i == 0) {// 杩涚墖缁堟
@@ -92,4 +98,11 @@
     homeMapper.DeleteByGlassID(glassid);
   }
 
+public Result FrameStateUpdate(String frameno, String framestate) {
+    homeMapper.FrameStateUpdate(frameno, framestate);
+    Map<String, Object> map = new HashMap<>();
+    map.put("message", "200");
+    return Result.success(map);
+}
+
 }

--
Gitblit v1.8.0