From 2a693c6842788d1011d69e62af3df6dfd06ecf16 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 19 一月 2024 14:43:50 +0800
Subject: [PATCH] 增加汇报写入判断限制
---
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 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 256c2e9..c7a9a27 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,7 +23,8 @@
private SpianMapper spianMapper;
@Autowired
SpianService spianService;
-
+ @Autowired
+ StorageCageService storageCageService;
public void AddOutSliceS(String[][] AluminumFrames) throws SQLException {
// int sequence = homeMapper.SelectMaxSquence();
@@ -57,7 +58,7 @@
homeMapper.CompleteQueueByFrameNo(frameid);
}
StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
- if (storageCage != null&&storageCage.getState().equals("3")) {
+ if (storageCage != null && storageCage.getState().equals("3")) {
spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
homeMapper.DeleteByGlassID(glassid);
}
@@ -66,26 +67,59 @@
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 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) {// 杩涚墖缁堟
+ homeMapper.UpdateTask(0,glassid);// 瀹屾垚杩涚墖浠诲姟
+ DeleteByGlassIDs(glassid);//鍒犻櫎杩涚墖浠诲姟
+ homeMapper.UpdateOutSliceGlass(glassid);
+ } else if(i==1) {// 鍑虹墖缁堟
+ homeMapper.UpdateTask(1,glassid);// 瀹屾垚鍑虹墖浠诲姟
+ spianMapper.UpdataGlassCage(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")) {
+ homeMapper.UpdataCageWidth(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
+ }
+ }
homeMapper.DeleteByGlassID(glassid);
+
+
+ }
+
+ //淇敼閾濇纭鐘舵��
+ public Result FrameStateUpdate(String frameno) {
+ homeMapper.FrameStateUpdate(frameno);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+ //鏌ヨ褰撳墠閾濇
+ public Out_slice SelectCurrentFrame() {
+ return homeMapper.SelectCurrentFrame();
}
}
--
Gitblit v1.8.0