From 58d7b0e12ccd92cf3934f6582b51b5fbcecaa39a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:41 +0800
Subject: [PATCH] 修改注入方式

---
 springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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 c7a9a27..359567d 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
@@ -52,16 +52,7 @@
 
   // 瀹屾垚鍑虹墖浠诲姟
   public Result CompleteQueue(String id, String frameid, String glassid) {
-    homeMapper.CompleteQueue(id);
-    Short num = homeMapper.SelectCountByFrameNo(frameid);
-    if (num == 0) {
-      homeMapper.CompleteQueueByFrameNo(frameid);
-    }
-    StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
-    if (storageCage != null && storageCage.getState().equals("3")) {
-      spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
-      homeMapper.DeleteByGlassID(glassid);
-    }
+    homeMapper.CompleteQueueByGlassId(glassid);
     Map<String, Object> map = new HashMap<>();
     map.put("message", "200");
     return Result.success(map);
@@ -101,12 +92,11 @@
   public void DeleteByGlassIDs(String glassid) {
     List<StorageCage> glassinfor = homeMapper.SelectStorageInfoByGlassId(glassid);
     for (StorageCage storageCage : glassinfor) {
-      if (storageCage.getState().equals("2")) {
+      if (storageCage.getState().equals("2")||storageCage.getState().equals("1")) {
         homeMapper.UpdataCageWidth(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
       }
     }
     homeMapper.DeleteByGlassID(glassid);
-
     
   }
 
@@ -122,4 +112,16 @@
     return homeMapper.SelectCurrentFrame();
   }
 
+public Result CompleteQueueByFrameNo(String frameNo) {
+  Map<String, Object> map = new HashMap<>();
+  Short num= homeMapper.SelectOutingQueueCount(frameNo);
+  if(num==0){
+    homeMapper.CompleteQueueByFrameNo(frameNo);
+    map.put("message", "200");
+  }else{
+    map.put("message", "300");
+  }
+  return Result.success(map);
+}
+
 }

--
Gitblit v1.8.0