From 4142b96426da5346f5e2143a54775dbe5b154d2c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 20 十二月 2023 15:05:46 +0800
Subject: [PATCH] 修改终止任务功能
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index b874580..e320119 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -142,15 +142,20 @@
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, glassid);
if (types == 0) {
- homeMapper.UpdateCageTask1(glassid);
- } else if(types==1) {
+ // homeMapper.UpdateCageTask1(glassid);
+ spianService.overtask(glassid);
+ } else if (types == 1) {
+ // homeMapper.DeleteByGlassID(glassid);
+ spianService.overtask(glassid);
+ } else if (types == 2) {//缁堟杩涚墖浠诲姟
+ spianService.overtask(glassid);
+ StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+ spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
homeMapper.DeleteByGlassID(glassid);
- }else{
- StorageCage glass = homeMapper.SelectGlassInfo(glassid);
- spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
- homeMapper.DeleteByGlassID(glassid);
- //鍙戦�佺粓姝换鍔′俊鍙�
- // S7control.getinstance().WriteWord("DB105.18", (short) 0);
+ // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
+ }else{//缁堟鍑虹墖浠诲姟
+ spianService.overtask(glassid);
+ homeMapper.UpdateOutSliceGlass(glassid);
}
map.put("message3", "200");
return Result.success(map);
@@ -199,7 +204,10 @@
int sequence = homeMapper.SelectMaxSquence();
homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
- sequence, position, (short)0);
+ sequence, position, (short) 0, north_glass_buffer1.getordernumber(), north_glass_buffer1.getlistnumber(),
+ north_glass_buffer1.getboxnumber(), north_glass_buffer1.getglasslength().toString(),
+ north_glass_buffer1.getglassheight().toString());
+
map.put("message2", "200");
} else {
map.put("message2", "300");
@@ -269,7 +277,7 @@
map.put("message", "200");
}
}
- return Result.success(map);
+ return Result.success(map);
}
// 鏌ヨ鐜荤拑淇℃伅
--
Gitblit v1.8.0