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 | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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 10f846f..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
@@ -23,6 +23,8 @@
private SpianMapper spianMapper;
@Autowired
SpianService spianService;
+ @Autowired
+ StorageCageService storageCageService;
public void AddOutSliceS(String[][] AluminumFrames) throws SQLException {
// int sequence = homeMapper.SelectMaxSquence();
@@ -50,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);
@@ -78,23 +71,33 @@
// 缁堟杩涚墖/鍑虹墖
public void StopTask(String glassid, int i) {
if (i == 0) {// 杩涚墖缁堟
- spianService.overtask(glassid);
- DeleteByGlassIDs(glassid);
+ homeMapper.UpdateTask(0,glassid);// 瀹屾垚杩涚墖浠诲姟
+ DeleteByGlassIDs(glassid);//鍒犻櫎杩涚墖浠诲姟
homeMapper.UpdateOutSliceGlass(glassid);
- } else {// 鍑虹墖缁堟
- spianMapper.UpdatetaskOut(glassid);// 瀹屾垚鍑虹墖浠诲姟
+ } else if(i==1) {// 鍑虹墖缁堟
+ homeMapper.UpdateTask(1,glassid);// 瀹屾垚鍑虹墖浠诲姟
spianMapper.UpdataGlassCage(glassid, 0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
- spianMapper.UpdateCageOver(glassid, 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
homeMapper.UpdateOutSliceGlass(glassid);// 淇敼鍑虹墖闃熷垪姝ょ幓鐠冪姸鎬佷负缂哄け
-
+ }else{
+ //娓呴櫎杩涚墖
+ homeMapper.UpdateTask(2,glassid);
+ homeMapper.UpdateOutSliceGlass(glassid);
+ //娓呴櫎杩涘嚭鐗囩幓鐠僫d
+ DeleteByGlassIDs(glassid);
}
+
}
// 鍒犻櫎绗煎唴鐜荤拑杩樺師瀹藉害
public void DeleteByGlassIDs(String glassid) {
- StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
- spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+ List<StorageCage> glassinfor = homeMapper.SelectStorageInfoByGlassId(glassid);
+ for (StorageCage storageCage : glassinfor) {
+ if (storageCage.getState().equals("2")||storageCage.getState().equals("1")) {
+ homeMapper.UpdataCageWidth(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
+ }
+ }
homeMapper.DeleteByGlassID(glassid);
+
}
//淇敼閾濇纭鐘舵��
@@ -109,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