From 0b6ddf2bf0d6c70867611b730ac445a242a89931 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 08 九月 2023 08:13:12 +0800
Subject: [PATCH] 合并
---
CanadaMes-ui/src/views/Electrical/alarm.vue | 30 ---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 2
CanadaMes-ui/src/views/Electrical/Parameter.vue | 132 ------------------
CanadaMes-ui/src/lang/locales/en-US.json | 134 ------------------
CanadaMes-ui/src/lang/locales/zh-CN.json | 98 -------------
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 22 ---
6 files changed, 11 insertions(+), 407 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index f307fe0..02c22fa 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,5 +1,5 @@
{
-<<<<<<< HEAD
+
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -124,134 +124,8 @@
"淇敼瑙掕壊鎴愬姛": "Successfully modified role",
"鍒犻櫎瑙掕壊鎴愬姛": "Successfully deleted role",
"淇敼鐢ㄦ埛鎴愬姛":"Successfully modified user",
- "translation": {
-
- }
- }
-=======
- "systemTitle": "Login System",
- "usernamePlaceholder": "Please enter username",
- "passwordPlaceholder": "Please enter password",
- "loginButton": "Login",
- "registerButton": "Register",
- "resetButton": "Reset",
- "usernameRequired": "Please enter username",
- "usernameLength": "Username must be between 5 and 15 characters",
- "passwordRequired": "Please enter password",
- "passwordLength": "Password must be between 5 and 15 characters",
- "loginSuccess": "Login successful",
- "langBtnCN": "Chinese",
- "langBtnEN": "English",
- "langHome": "Home",
- "langUserManagement": "User Management",
- "langUserList": "User List",
- "langUsernamePlaceholder": "Please enter username",
- "langEmailPlaceholder": "Please enter email",
- "langSearch": "Search",
- "langAddUser": "Add User",
- "langUsername": "Username",
- "langEmail": "Email",
- "langCreateTime": "Create Time",
- "langDisabled": "Disabled",
- "langAction": "Action",
- "langEdit": "Edit",
- "langDelete": "Delete",
- "langAddUserTitle": "Add User",
- "langPassword": "Password",
- "langState": "State",
- "langSelect": "Please select",
- "langCancel": "Cancel",
- "langConfirm": "Confirm",
- "langEditUserTitle": "Edit User",
- "northglassMESsystem": "NorthGlassMesSystem",
- "exit": "exit",
- "changePassword": "changePassword",
- "resetPassword": "resetPassword",
- "home": "Home",
- "role": "role",
- "langRoleManagement": "Role Management",
- "langRoleList": "Role List",
- "langEnterRoleName": "Please enter role name",
- "langAddRole": "Add Role",
- "langName": "Name",
- "langIsValid": "Is Valid",
- "langOperation": "Operation",
- "langPleaseSelect": "Please select",
- "langValid": "Valid",
- "langInvalid": "Invalid",
- "langAddRoleSuccess": "Add role successfully",
- "langEnterName": "Please enter name",
- "langLengthBetween": "Length should be between",
- "langAnd": "and",
- "langCharacters": "characters",
- "langEnterState": "Please enter state",
- "langUpdateState": "Update state successfully",
- "langEditRole": "Edit Role",
- "langEditRoleSuccess": "Edit role successfully",
- "langDeleteRoleConfirm": "Are you sure you want to delete this role?",
- "langPrompt": "Prompt",
- "langDeleteRoleSuccess": "Delete role successfully",
- "langCancelDelete": "Cancelled deleting",
- "langRoleName": "langRoleName",
- "updateSuccessMessage": "updateSuccessMessage",
- "paginationTotal": "Total {total}",
- "paginationSizes": "Items per page",
- "paginationPrev": "Previous",
- "paginationPager": "{currentPage}/{pageCount}",
- "paginationNext": "Next",
- "paginationJumper": "Jump to",
- "breadcrumb": {
- "home": "Home",
- "permissionManagement": "Permission Management",
- "permissionList": "Permission List"
- },
- "search": {
- "placeholder": "Enter keywords"
- },
- "button": {
- "addPermission": "Add Permission",
- "cancel": "Cancel",
- "confirm": "Confirm"
- },
- "table": {
- "role": "Role",
- "permissionDescription": "Permission Description",
- "permissionValue": "Permission Value",
- "createTime": "Create Time",
- "isActive": "Is Active",
- "operation": "Operation"
- },
- "tooltip": {
- "edit": "Edit",
- "delete": "Delete"
- },
- "dialog": {
- "addPermission": "Add Permission",
- "editPermission": "Edit Permission"
- },
- "form": {
- "role": "Role",
- "select": "Please Select",
- "permission": "Permission",
- "isActive": "Is Active"
- },
- "鎿嶄綔": "Operation",
- "鏈夋晥": "Valid",
- "鏃犳晥": "Invalid",
- "璇疯緭鍏ュ悕绉�": "Please enter a name",
- "闀垮害鍦� 2 鍒� 15 涓瓧绗�": "Length between 2 and 15 characters",
- "璇疯緭鍏ョ姸鎬�": "Please enter the status",
- "娣诲姞瑙掕壊": "Add Role",
- "淇敼瑙掕壊": "Edit Role",
- "鍒犻櫎瑙掕壊": "Delete Role",
- "姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?": "This operation will permanently delete the role. Continue?",
- "鎻愮ず": "Reminder",
- "纭畾": "Confirm",
- "鍙栨秷": "Cancel",
- "娣诲姞瑙掕壊鎴愬姛": "Successfully added role",
- "鏇存柊鐘舵�佹垚鍔�": "Successfully updated status",
- "淇敼瑙掕壊鎴愬姛": "Successfully modified role",
- "鍒犻櫎瑙掕壊鎴愬姛": "Successfully deleted role",
+
+
"translation": {
"D01 VFD error": "D01 VFD error",
"D02 VFD error": "D02 VFD error",
@@ -301,4 +175,4 @@
"Alarm": "Alarm",
"Distribute": "Distribute"
}
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
+
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 4f0e86a..6f36852 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -35,101 +35,7 @@
"exit": "閫�鍑�",
"changePassword": "淇敼瀵嗙爜",
"resetPassword": "閲嶇疆瀵嗙爜",
-<<<<<<< HEAD
- "home":"涓婚〉",
- "role":"瑙掕壊",
- "langRoleManagement": "瑙掕壊绠＄悊",
- "langRoleList": "瑙掕壊鍒楄〃",
- "langEnterRoleName": "璇疯緭鍏ヨ鑹插悕绉�",
- "langAddRole": "娣诲姞瑙掕壊",
- "langName": "鍚嶇О",
- "langIsValid": "鏄惁鏈夋晥",
- "langOperation": "鎿嶄綔",
- "langPleaseSelect": "璇烽�夋嫨",
- "langValid": "鏈夋晥",
- "langInvalid": "鏃犳晥",
- "langConfirm": "纭畾",
- "langCancel": "鍙栨秷",
- "langAddRoleSuccess": "娣诲姞瑙掕壊鎴愬姛",
- "langEnterName": "璇疯緭鍏ュ悕绉�",
- "langLengthBetween": "闀垮害鍦�",
- "langAnd": "鍜�",
- "langCharacters": "涓瓧绗︿箣闂�",
- "langEnterState": "璇疯緭鍏ョ姸鎬�",
- "langUpdateState": "鐘舵�佹洿鏂版垚鍔�",
- "langEditRole": "缂栬緫瑙掕壊",
- "langEditRoleSuccess": "缂栬緫瑙掕壊鎴愬姛",
- "langDeleteRoleConfirm": "纭畾瑕佸垹闄よ瑙掕壊鍚楋紵",
- "langPrompt": "鎻愮ず",
- "langDeleteRoleSuccess": "鍒犻櫎瑙掕壊鎴愬姛",
- "langCancelDelete": "宸插彇娑堝垹闄�",
- "langRoleName":"瑙掕壊鍚嶇О",
- "updateSuccessMessage":"鏇存柊鎴愬姛",
- "paginationTotal": "鍏� {total} 鏉�",
- "paginationSizes": "姣忛〉鏄剧ず",
- "paginationPrev": "涓婁竴椤�",
- "paginationPager": "{currentPage}/{pageCount}",
- "paginationNext": "涓嬩竴椤�",
- "paginationJumper": "璺宠嚦",
- "breadcrumb": {
- "home": "棣栭〉",
- "permissionManagement": "鏉冮檺绠＄悊",
- "permissionList": "鏉冮檺鍒楄〃"
- },
- "search": {
- "placeholder": "璇疯緭鍏ュ叧閿瓧"
- },
- "button": {
- "addPermission": "娣诲姞鏉冮檺",
- "cancel": "鍙栨秷",
- "confirm": "纭"
- },
- "table": {
- "role": "瑙掕壊",
- "permissionDescription": "鏉冮檺鎻忚堪",
- "permissionValue": "鏉冮檺鍊�",
- "createTime": "鍒涘缓鏃堕棿",
- "isActive": "鏄惁婵�娲�",
- "operation": "鎿嶄綔"
- },
- "tooltip": {
- "edit": "淇敼",
- "delete": "鍒犻櫎"
- },
- "dialog": {
- "addPermission": "娣诲姞鏉冮檺",
- "editPermission": "缂栬緫鏉冮檺"
- },
- "form": {
- "role": "瑙掕壊",
- "select": "璇烽�夋嫨",
- "permission": "鏉冮檺",
- "isActive": "鏄惁婵�娲�"
- },
- "鎿嶄綔": "鎿嶄綔",
- "鏈夋晥": "鏈夋晥",
- "鏃犳晥": "鏃犳晥",
- "璇疯緭鍏ュ悕绉�": "璇疯緭鍏ュ悕绉�",
- "闀垮害鍦� 2 鍒� 15 涓瓧绗�": "闀垮害鍦� 2 鍒� 15 涓瓧绗�",
- "璇疯緭鍏ョ姸鎬�": "璇疯緭鍏ョ姸鎬�",
- "娣诲姞瑙掕壊": "娣诲姞瑙掕壊",
- "淇敼瑙掕壊": "淇敼瑙掕壊",
- "鍒犻櫎瑙掕壊": "鍒犻櫎瑙掕壊",
- "姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?": "姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?",
- "鎻愮ず": "鎻愮ず",
- "纭畾": "纭畾",
- "鍙栨秷": "鍙栨秷",
- "娣诲姞瑙掕壊鎴愬姛": "娣诲姞瑙掕壊鎴愬姛",
- "鏇存柊鐘舵�佹垚鍔�": "鏇存柊鐘舵�佹垚鍔�",
- "淇敼瑙掕壊鎴愬姛": "淇敼瑙掕壊鎴愬姛",
- "鍒犻櫎瑙掕壊鎴愬姛": "鍒犻櫎瑙掕壊鎴愬姛",
- "淇敼鐢ㄦ埛鎴愬姛":"淇敼鐢ㄦ埛鎴愬姛",
- "translation": {
-
- }
- }
-
-=======
+
"home": "涓婚〉",
"role": "瑙掕壊",
"langRoleManagement": "瑙掕壊绠＄悊",
@@ -266,4 +172,4 @@
"Alarm": "鎶ヨ淇℃伅",
"Distribute": "涓嬪彂"
}
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
+
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index a962b56..e9be395 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -1,23 +1,15 @@
<template>
<div class="app">
-<<<<<<< HEAD
<!-- 闈㈠寘灞戝鑸尯鍩� -->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
<router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
<el-button type="text">璁惧绠＄悊</el-button>
-=======
- <!--闈㈠寘灞戝鑸尯鍩�-->
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
- <el-button type="text">{{ $t('Distribute') }}</el-button>
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
<router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>
<router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text">State</router-link>
<router-link to="/Electrical/alarm" tag="el-button" type="text">Alarm</router-link>
</el-breadcrumb>
-<<<<<<< HEAD
<div>Parameter</div>
@@ -36,41 +28,15 @@
</template>
<script>
-=======
- <div>Parameter</div>
-
- <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">
- <div id="btn_div">
- <el-button type="primary" @click="send()">{{ $t('Distribute') }}</el-button>
- </div>
- <div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
- <el-input style="width: 280px;" class="in_mc" v-model="item.name" readonly></el-input>
- <el-input v-model.number="item.value" style="width: 80px;"
- @input="handleChange(index, $event.target.value)"></el-input>
- </div>
- </el-form>
- </div>
-</template>
-
-<script>
-
-import LanguageMixin from '../../lang/LanguageMixin'
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
let socket;
export default {
name: "Parameter",
-<<<<<<< HEAD
data() {
-=======
- mixins: [LanguageMixin],
- data () {
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
return {
record: {
params: [100, 200, 10, 10, 10, 10],
xyData: [
-<<<<<<< HEAD
{ name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0 },
{ name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0 },
{ name: "conveyor Velocity(Manual)", value: 0 ,value2: 0 },
@@ -83,20 +49,6 @@
{ name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0 },
{ name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
{ name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0 }
-=======
- { name: "conveyor Velocity(Auto FAST)", value: 0 },
- { name: "conveyor Velocity(Auto SLOW)", value: 0 },
- { name: "conveyor Velocity(Manual)", value: 0 },
- { name: "A01 A02 TURN JOG Velocity", value: 0 },
- { name: "A01 A02 TRAVEL JOG Velocity", value: 0 },
- { name: "B01 B02 TRAVEL JOG Velocity", value: 0 },
- { name: "A01 A02 TURN POS Velocity AUTO", value: 0 },
- { name: "A01 A02 TURN POS Velocity manual", value: 0 },
- { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0 },
- { name: "A01 A02 TRAVEL POS Velocity manual", value: 0 },
- { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0 },
- { name: "B01 B02 TRAVEL POS Velocity manual", value: 0 }
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
],
canshu: []
},
@@ -109,7 +61,6 @@
}
};
},
-<<<<<<< HEAD
created() {
@@ -119,53 +70,28 @@
initWebSocket() {
let viewname = "Parameter";
-=======
- created () {
- this.initWebSocket();
- },
- methods: {
- initWebSocket () {
- let viewname = "Parameter";
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
-<<<<<<< HEAD
-=======
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
if (socket != null) {
socket.close();
socket = null;
}
-<<<<<<< HEAD
// 寮�鍚竴涓獁ebsocket鏈嶅姟
socket = new WebSocket(socketUrl);
-=======
-
- // 寮�鍚竴涓獁ebsocket鏈嶅姟
- socket = new WebSocket(socketUrl);
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鎵撳紑浜嬩欢
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
};
-<<<<<<< HEAD
-=======
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鏀跺埌娑堟伅
socket.onmessage = (msg) => {
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
-<<<<<<< HEAD
}
let obj = JSON.parse(msg.data);
@@ -183,61 +109,28 @@
this.$forceUpdate();
};
-=======
- }
-
- let obj = JSON.parse(msg.data);
- this.record.params[0] = obj.params[0];
-
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
- } else {
- this.record.xyData[a].value = this.record.params[0][a];
- }
- }
-
- console.log(this.record.xyData);
- this.$forceUpdate();
- };
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鍏抽棴浜嬩欢
socket.onclose = function () {
console.log("websocket宸插叧闂�");
};
-<<<<<<< HEAD
-=======
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 鍙戠敓閿欒浜嬩欢
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
}
},
-<<<<<<< HEAD
send() {
this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value2)); // 杞崲涓烘暣鏁版暟缁�
console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
},
handleChange(index, value) {
-=======
- send () {
- this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
- console.log(this.messagepack);
- socket?.send(JSON.stringify(this.messagepack));
- },
- handleChange (index, value) {
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
this.record.xyData[index].value = value;
}
}
};
</script>
-<<<<<<< HEAD
<style>
.kuai_div {
@@ -254,27 +147,6 @@
}
-=======
-
-<style>
-.kuai_div {
- width: 30%;
- margin-bottom: 15px;
-}
-
-.el-input {
- border: none;
-}
-
-.el-input__inner {
- border: 1px solid black;
-}
-
-.in_mc .el-input__inner {
- border: none;
-}
-
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
#btn_div {
width: 100%;
}
@@ -282,7 +154,6 @@
#btn_div .el-button {
float: right;
}
-<<<<<<< HEAD
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
@@ -293,6 +164,3 @@
-moz-appearance: textfield; /* Firefox涓鐢ㄤ笂涓嬬澶� */
}
</style>
-=======
-</style>
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 403bec5..93108d0 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -47,11 +47,9 @@
},
roles: [],
-<<<<<<< HEAD
- localizedRoles:[],
-=======
+
localizedRoles: [],
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
+
messagepack: {
data: { taskname: "" }
},
@@ -68,27 +66,7 @@
},
methods: {
-<<<<<<< HEAD
- load() {
- setAll().then(res => {
- this.roles = res.data.list;
- const language = this.$i18n.locale;
- if (language === 'zh-CN') {
- this.replaceChineseWithEnglish();
- } else {
- this.localizedRoles = [...this.roles];
- }
- console.log(this.localizedRoles);
- });
-},
-replaceChineseWithEnglish() {
- const translation = this.$t('translation');
- this.localizedRoles = this.roles.map(role => ({
- ...role,
- content: translation[role.content] || role.content
- }));
-},
-=======
+
load () {
setAll().then(res => {
this.roles = res.data.list;
@@ -108,7 +86,7 @@
content: translation[role.content] || role.content
}));
},
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
+
init () {
let viewname = "alarm";
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index faa9362..bcd2cf9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -75,29 +75,7 @@
e.printStackTrace();
}
}
-<<<<<<< HEAD
- }
-
- private void sendMessages() {
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("action");
- if (sendwServer != null) {
-
- List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);
- List<Boolean> paramlist2 = new ArrayList<>(Arrays.asList(true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false));
-
-
- List<Integer> binaryList = new ArrayList<>();
-
- for (Boolean value : paramlist2) {
- int binaryValue = value ? 1 : 0;
- binaryList.add(binaryValue);
- }
- // new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("params", binaryList);
-=======
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
List<Boolean> messageBooleans = new ArrayList<>();
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 f9f24bf..b688705 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
@@ -41,7 +41,7 @@
@Select("select cage,cell,max(state)as shu from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage) limit 1;")
StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);
//淇敼绗煎瓙淇℃伅(杩涚墖)
- @Update("update storage_cage set state=1,width=width #{width},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{glasswidth} where cage=#{cage} and cell=#{cell} and tier=#{tier}");
+// @Update("update storage_cage set state=1,width=width #{width},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{glasswidth} where cage=#{cage} and cell=#{cell} and tier=#{tier}");
// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
--
Gitblit v1.8.0