From 6df95d633b4a0b21e6eb0a57e22feb7bbb6eb65d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 16:47:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java |   78 +++++++++++++++++++++++++++++----------
 1 files changed, 58 insertions(+), 20 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 e29eb16..100ac98 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,52 +6,90 @@
 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;
+import com.example.springboot.mapper.SpianMapper;
 
 @Service
 public class OutSliceServive {
 
   @Autowired
   private HomeMapper homeMapper;
+  @Autowired
+  private SpianMapper spianMapper;
+  @Autowired
+  SpianService spianService;
 
   @Autowired
   private JdbcConnections jdbcConnections;
 
   public void AddOutSliceS(String[][] AluminumFrames) throws SQLException {
-    int sequence = homeMapper.SelectMaxSquence();
+    // int sequence = homeMapper.SelectMaxSquence();
 
     // 娣诲姞鍒版暟鎹簱
-    for (String[] item : AluminumFrames) {
-      if (item[1] == "true") {
-        String position = jdbcConnections.SelectPositionByFrameBarcode(item[3]);
-        homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5], sequence, position);
-        sequence += 1;
-      }
-    }
+    // for (String[] item : AluminumFrames) {
+    // if (item[1] == "true") {
+    // Short state=0;
+    // String position = jdbcConnections.SelectPositionByFrameBarcode(item[3]);
+    // homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5],
+    // sequence, position,state );
+    // sequence += 1;
+    // }
+    // }
   }
 
   // 鏌ヨ鍑虹墖闃熷垪
   public List<Out_slice> SelectProductionqueue() {
     List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
-    for (Out_slice out_slice : listoutslice) {
-      out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
-    }
+    // for (Out_slice out_slice : listoutslice) {
+    // out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
+    // }
     return listoutslice;
   }
 
-public Result CompleteQueue(String id, String frameid) {
-  homeMapper.CompleteQueue(id);
-  Short num=homeMapper.SelectCountByFrameNo(frameid);
-  if(num==0){
-    homeMapper.CompleteQueueByFrameNo(frameid);
+  // 瀹屾垚鍑虹墖浠诲姟
+  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);
+    }
+    Map<String, Object> map = new HashMap<>();
+    map.put("message", "200");
+    return Result.success(map);
   }
-  Map<String, Object> map = new HashMap<>();
-  map.put("message", "200");
-  return Result.success(map);
-}
+
+  //缁堟杩涚墖/鍑虹墖
+  public void StopTask(String glassid, int i) {
+    if (i == 0) {// 杩涚墖缁堟
+      spianService.overtask(glassid);
+      DeleteByGlassIDs(glassid);
+      homeMapper.UpdateOutSliceGlass(glassid);
+    } else {// 鍑虹墖缁堟
+      spianMapper.UpdatetaskOut(glassid);//瀹屾垚鍑虹墖浠诲姟
+      spianMapper.UpdataGlassCage(glassid, 0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
+      spianMapper.UpdateCageOver(glassid, 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
+      homeMapper.UpdateOutSliceGlass(glassid);//淇敼鍑虹墖闃熷垪姝ょ幓鐠冪姸鎬佷负缂哄け
+      
+    }
+  }
+
+  //鍒犻櫎绗煎唴鐜荤拑杩樺師瀹藉害
+  public void DeleteByGlassIDs(String glassid) {
+    StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+    spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+    homeMapper.DeleteByGlassID(glassid);
+  }
 
 }

--
Gitblit v1.8.0