From 3545d55a89255b2c5849018019335d90172fcc04 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 20 十二月 2023 13:26:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 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 dbe13fa..d749f6d 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
@@ -68,7 +68,7 @@
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鏉冮檺
@GetMapping("/SelectPermissionByUserName")
- public Result SelectPermissionByUserName(String username) {
+ public Result SelectPermissionByUserName(String username) throws SQLException {
Map<String, Object> map = new HashMap<>();
List<RolePermission> permission = homeMapper.SelectPermissionByUserName(username);
map.put("permission", permission);
@@ -140,15 +140,15 @@
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types,glassid);
- StorageCage glass = homeMapper.SelectGlassInfo(glassid);
+ homeMapper.UpdateTask(types, glassid);
+ // StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
- S7control.getinstance().WriteWord("DB105.14", (short) 0);
+ // S7control.getinstance().WriteWord("DB105.16", (short) 0);
} else {
- spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
- homeMapper.UpdateCageTask2(glassid);
- S7control.getinstance().WriteWord("DB105.12", (short) 0);
+ // spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ homeMapper.DeleteByGlassID(glassid);
+ // S7control.getinstance().WriteWord("DB105.18", (short) 0);
}
map.put("message3", "200");
return Result.success(map);
@@ -197,12 +197,11 @@
int sequence = homeMapper.SelectMaxSquence();
homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
- sequence, position);
+ sequence, position, (short)0);
map.put("message2", "200");
} else {
map.put("message2", "300");
}
-
} else {
map.put("message2", "400");
}
@@ -256,14 +255,19 @@
public Result Inglassid(short cage, short cell, short tier, @RequestBody Queue queue) {
Map<String, Object> map = new HashMap<>();
short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
- if (result > 0) {
- map.put("message", "300");
+ Double cagewidth = homeMapper.SelectCageWidth(cage, cell);
+ if (cagewidth - queue.getglasswidth() - 400 < 0 || (cagewidth == 2750 && queue.getglasswidth() > cagewidth)) {
+ map.put("message", "400");
} else {
- homeMapper.Inglassid(queue, cage, cell, tier);
- spianMapper.UpdataAddCage1(queue.getglasswidth(), cage, cell);
- map.put("message", "200");
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.Inglassid(queue, cage, cell, tier);
+ spianMapper.UpdataAddCage1(queue.getglasswidth(), cage, cell);
+ map.put("message", "200");
+ }
}
- return Result.success(map);
+ return Result.success(map);
}
// 鏌ヨ鐜荤拑淇℃伅
@@ -331,10 +335,10 @@
return Result.success(map);
}
- // 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ // 鏍规嵁閾濇id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
public Result DeleteProductionQueueGlass(String FrameNo) {
- homeMapper.DeleteProductionQueueGlass(FrameNo);
+ homeMapper.CompleteQueueByFrameNo(FrameNo);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -372,11 +376,11 @@
return Result.success(map);
}
- //鎵嬪姩瀹屾垚浠诲姟
+ // 鎵嬪姩瀹屾垚浠诲姟
@PostMapping("/CompleteQueue")
- public Result CompleteQueue(String id,String frameid,String glassid) {
- return outSliceServive.CompleteQueue(id,frameid,glassid);
-
+ public Result CompleteQueue(String id, String frameid, String glassid) {
+ return outSliceServive.CompleteQueue(id, frameid, glassid);
+
}
-
+
}
--
Gitblit v1.8.0