From 733aaaac3ed6a41b78f74c0bcb4d5de7725d788c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 15 一月 2024 16:32:02 +0800
Subject: [PATCH] 更新已有未完成任务提示
---
.vscode/settings.json | 3 ++-
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 11 +++++++----
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 7 +++++++
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a760fd6..dcafc04 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
{
"java.configuration.updateBuildConfiguration": "interactive",
- "java.debug.settings.onBuildFailureProceed": true
+ "java.debug.settings.onBuildFailureProceed": true,
+ "java.compile.nullAnalysis.mode": "automatic"
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index cde3980..58fa75c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -32,13 +32,16 @@
@Select("select COUNT(tier)as tier from storage_cage where cage=#{cage} and cell=#{cell} and state!=0 and state!=3;")
int selectsum(int cage, int cell);
- // 瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
+ // 瀹屾垚鍑虹墖涓殑鐜荤拑鐘舵��
@Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=3;")
void UpdateCageOver(String glassid, int state);
-
+ // 瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
@Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=2;")
void UpdateCageadd(String glassid, int state);
-
+ //鏌ヨ鏄惁鏈夎绫诲瀷鐨勪换鍔¤繕鏈畬鎴�
+ // 鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
+ @Select("select COUNT(state) from storage_cage where state=#{state}")
+ int SelectCageState(int state);
// 鑾峰彇鐜荤拑淇℃伅
@Select("select *,ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight,FrameBarcode from north_glass_buffer1 where barcode=#{glassid}")
north_glass_buffer1 selectGlass(String glassid);
@@ -191,7 +194,7 @@
int Selectqueuestate();
// 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
- @Select("SELECT glassid FROM `out_slice` where state=0 and framestate!=1 order by sequence,id limit 1;")
+ @Select("SELECT glassid FROM `out_slice` where state=0 order by sequence,id limit 1;")
String SelectOutSlice();
// 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index fc1ebb5..7d4844b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -29,9 +29,16 @@
double minwidth = 0;
north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+ //濡傛灉娌℃湁姝d鏃�
if (glasslist == null) {
return (300);
}
+ //鍒ゆ柇鏄惁杩樻湁杩涚墖浠诲姟鏈畬鎴愮殑
+ int cagestate=spianMapper.SelectCageState(2);
+ //鏈夎繘鐗囦换鍔℃湭瀹屾垚鏃惰繑鍥炰笉杩涚墖
+ if(cagestate>0){
+ return (300);
+ }
double widths = glasslist.getglasslengthmm();
String orderids = glasslist.getordernumber();
String FrameBarcode = glasslist.getFrameBarcode();
--
Gitblit v1.8.0