From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 03a18a2..8c1bf9c 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);
@@ -144,11 +144,11 @@
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);
+ // S7control.getinstance().WriteWord("DB105.18", (short) 0);
}
map.put("message3", "200");
return Result.success(map);
@@ -197,7 +197,7 @@
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");
--
Gitblit v1.8.0