From 74edb80b30728b2a94389f8bc180229a727f86c8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 26 九月 2023 15:36:34 +0800
Subject: [PATCH] 主界面理片笼添加添加玻璃信息功能，优化界面样式
---
CanadaMes-ui/src/views/home/index.vue | 203 +++++++++++++++++-------
CanadaMes-ui/src/api/home.js | 48 ++++--
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java | 6
CanadaMes-ui/src/lang/locales/en-US.json | 31 ++-
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 10
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 28 ++
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 66 +++++--
CanadaMes-ui/src/lang/locales/zh-CN.json | 29 ++-
8 files changed, 285 insertions(+), 136 deletions(-)
diff --git a/CanadaMes-ui/src/api/home.js b/CanadaMes-ui/src/api/home.js
index 1c301d1..ac639c6 100644
--- a/CanadaMes-ui/src/api/home.js
+++ b/CanadaMes-ui/src/api/home.js
@@ -32,7 +32,7 @@
return request({
url: '/home/InsertOrder?orderid=' + orderid,
method: 'get',
- data :""
+ data: ""
})
}
@@ -40,15 +40,15 @@
return request({
url: '/home/Addglassid?glassid=' + glassid,
method: 'get',
- data :""
+ data: ""
})
}
-export function UpdateTask(types,glassid,shelfrack) {
+export function UpdateTask(types, glassid, shelfrack) {
return request({
- url: '/home/UpdateTask?types=' + types + '&glassid='+glassid+'&shelfrack='+shelfrack,
+ url: '/home/UpdateTask?types=' + types + '&glassid=' + glassid + '&shelfrack=' + shelfrack,
method: 'get',
- data :""
+ data: ""
})
}
@@ -56,31 +56,31 @@
return request({
url: '/home/SelectAlarmmgInfo',
method: 'get',
- data :""
+ data: ""
})
}
export function SelectCageInfo(cage) {
return request({
- url: '/home/SelectCageInfo?cage='+cage,
+ url: '/home/SelectCageInfo?cage=' + cage,
method: 'get',
- data :""
+ data: ""
})
}
export function DeleteByGlassID(glassid) {
return request({
- url: '/home/DeleteByGlassID?glassid='+glassid,
+ url: '/home/DeleteByGlassID?glassid=' + glassid,
method: 'get',
- data :""
+ data: ""
})
}
export function OutByGlassID(glassid) {
return request({
- url: '/home/OutByGlassID?glassid='+glassid,
+ url: '/home/OutByGlassID?glassid=' + glassid,
method: 'get',
- data :""
+ data: ""
})
}
@@ -88,7 +88,7 @@
return request({
url: '/home/Loadcarlist',
method: 'get',
- data :""
+ data: ""
})
}
@@ -96,14 +96,30 @@
return request({
url: '/home/SelectPassword',
method: 'get',
- data :""
+ data: ""
})
}
export function SelectGlassByGlassID(glassid) {
return request({
- url: '/home/SelectGlassByGlassID?glassid='+glassid,
+ url: '/home/SelectGlassByGlassID?glassid=' + glassid,
method: 'get',
- data :""
+ data: ""
+ })
+}
+
+export function Disabled(cage, cell, disabled) {
+ return request({
+ url: '/home/Disabled?cage=' + cage + '&cell=' + cell + '&disabled=' + disabled,
+ method: 'get',
+ data: ""
+ })
+}
+
+export function Inglassid(cage,cell,tier,data) {
+ return request({
+ url: '/home/Inglassid?cage=' + cage + '&cell=' + cell+ '&tier=' + tier,
+ method: 'post',
+ data
})
}
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 1a0aeb4..60e56b0 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -228,7 +228,7 @@
"Enter the glass lD":"Enter the glass lD",
- "Manually feed the glass":"Manually feed the glass",
+ "Infeed barcodid":"Infeed barcodid",
"Enter the order number":"Enter the order number",
"Exit the glass by order number":"Exit the glass by order number",
"Please confirm the glass information":"Please confirm the glass information",
@@ -238,28 +238,29 @@
"order":"order",
"length":"length",
"width":"width",
- "coating":"coating",
"Operate":"Operate",
"end task":"end task",
"cancal":"cancal",
"confirm":"confirm",
"number":"number",
- "Coming out glass ID":"Coming out glass ID",
- "Incoming glass ID":"Incoming glass ID",
- "The Cage number being used":"The Cage number being used",
- "The Grille number being used":"The Grille number being used",
+ "Outfeed Barcodid":"Outfeed Barcodid",
+ "Infeed Barcodid":"Infeed Barcodid",
+ "The Cage number being used":"The Cage Number being used",
+ "The Slot number being used":"The Slot Number being used",
"Order Nmuber":"Order Nmuber",
- "Length and width":"Length and width",
+ "Length and Width":"Length and Width",
"id":"id",
"content":"content",
"timeon":"timeon",
"endTime":"endTime",
"The Cage number":"The Cage number",
- "tier":"tier",
- "cell":"cell",
- "glassid":"glassid",
- "order number":"order number",
+ "The Side":"The Side",
+ "The Slot Number":"The Slot Number",
+ "Barcodid":"Barcodid",
+ "Order Number":"Order Number",
+ "List Number":"List Number",
+ "Box Number":"Box Number",
"delete":"delete",
"out":"out",
@@ -281,6 +282,12 @@
"Password error":"Password error",
"DataBase Connection failed":"DataBase Connection failed",
"Distribute parameters":"Distribute parameters",
- "The glass size is not within the range":"The glass size is not within the range"
+ "The glass size is not within the range":"The glass size is not within the range",
+ "increase":"increase",
+ "Enable":"Enable",
+ "Disable":"Disable",
+ "Usage":"Usage",
+ "Space (Pieces)":"Space (Pieces)",
+ "This glass is already in the cage":"This glass is already in the cage"
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index fe88319..8989536 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -223,7 +223,7 @@
"Enter the glass lD":"杈撳叆鐜荤拑id",
- "Manually feed the glass":"鎵嬪姩涓婄墖",
+ "Infeed barcodid":"鎵嬪姩涓婄墖",
"Enter the order number":"杈撳叆璁㈠崟鍙�",
"Exit the glass by order number":"鎸夎鍗曞嚭鐗�",
"Please confirm the glass information":"璇风‘璁ょ幓鐠冧俊鎭�",
@@ -233,28 +233,29 @@
"order":"璁㈠崟",
"length":"闀�",
"width":"瀹�",
- "coating":"娑傚眰",
"Operate":"鎿嶄綔",
"end task":"瀹屾垚浠诲姟",
"cancal":"鍙栨秷",
"confirm":"纭",
"number":"鏁伴噺",
- "Coming out glass ID":"鍑虹墖鐜荤拑id",
- "Incoming glass ID":"杩涚墖鐜荤拑id",
+ "Outfeed Barcodid":"鍑虹墖鐜荤拑id",
+ "Infeed Barcodid":"杩涚墖鐜荤拑id",
"The Cage number being used":"绗煎瓙",
- "The Grille number being used":"鏍煎瓙",
+ "The Slot number being used":"鏍煎瓙",
"Order Nmuber":"璁㈠崟缂栧彿",
- "Length and width":"灏哄",
+ "List Number":"鍒楄〃缂栧彿",
+ "Box Number":"绠卞瓙缂栧彿",
+ "Length and Width":"灏哄",
"id":"id",
"content":"鍐呭",
"timeon":"鎶ヨ鏃堕棿",
"endTime":"缁撴潫鏃堕棿",
"The Cage number":"绗煎瓙",
- "tier":"灞�",
- "cell":"鏍煎瓙",
- "glassid":"鐜荤拑id",
- "order number":"璁㈠崟",
+ "The Side":"鍐呭渚�",
+ "The Slot Number":"鏍煎瓙",
+ "Barcodid":"鐜荤拑id",
+ "Order Number":"璁㈠崟",
"delete":"鍒犻櫎",
"out":"鍑虹墖",
@@ -284,6 +285,12 @@
"Password error":"瀵嗙爜閿欒",
"DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�",
"Distribute parameters":"涓嬪彂鍙傛暟",
- "The glass size is not within the range":"鐜荤拑灏哄涓嶅湪鑼冨洿鍐�"
+ "The glass size is not within the range":"鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
+ "increase":"娣诲姞",
+ "Enable":"鍚敤",
+ "Disable":"绂佺敤",
+ "Usage":"浣跨敤鐜�",
+ "Space (Pieces)":"绌洪棿(鐗囨暟)",
+ "This glass is already in the cage":"绗煎瓙閲屽凡鏈夋鐜荤拑"
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 2b76515..cae044e 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -66,16 +66,6 @@
/* width: 4.22px; */
}
-/* .gezi:nth-child(22),
-.gezi:nth-child(43),
-.gezi:nth-child(64),
-.gezi:nth-child(85) {
- margin-left: 7px;
- margin-left: 10px;
-} */
-
-
-
.blocks {
@@ -139,7 +129,7 @@
.el-table td,
.el-table th {
- padding: 8px 0;
+ padding: 5px 0;
}
.el-table__empty-block {
@@ -153,18 +143,21 @@
.box {
width: 90%;
margin-left: 5%;
- height: 35px;
color: red;
font-size: 12px;
overflow: hidden;
+ height: 20px;
+ /* height: 35px; */
}
.text {
width: auto;
- line-height: 35px;
+
white-space: nowrap;
animation: textScroll 20s linear infinite;
margin: 0 auto;
+ line-height: 20px;
+ /* line-height: 35px; */
}
@keyframes textScroll {
@@ -178,7 +171,7 @@
}
.el-dialog {
- width: 80%;
+ width: 90%;
}
</style>
<template>
@@ -196,18 +189,19 @@
</div>
<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
<el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
- <el-button type="primary" @click="showform()">{{ $t('Manually feed the glass') }}</el-button>
+ <el-button type="primary" @click="showform(1)">{{ $t('Infeed barcodid') }}</el-button>
<el-input style="width:15%;" :placeholder="$t('Enter the order number')" v-model="order"></el-input>
<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
</div>
<div>
<el-table :data="this.tasklist1" border style="width: 100%">
- <el-table-column prop="glassId" :label="$t('Coming out glass ID')"></el-table-column>
- <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
- <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
- <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
+ <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
+ <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
+ <el-table-column :width="150" prop="glassId" :label="$t('Outfeed Barcodid')"></el-table-column>
+ <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
+ <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
+ <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -216,12 +210,13 @@
</el-table-column>
</el-table>
<el-table :data="this.tasklist2" border style="width: 100%">
- <el-table-column prop="glassId" :label="$t('Incoming glass ID')"></el-table-column>
- <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
- <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
- <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
+ <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
+ <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
+ <el-table-column :width="150" prop="glassId" :label="$t('Infeed Barcodid')"></el-table-column>
+ <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
+ <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
+ <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -234,11 +229,11 @@
<div v-for="item in tableData" :key="item['cageno']" class="occupy">
<el-col style="text-align:left;font-weight: bold;">#{{ item['cage'] }}</el-col>
<el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span class="biao">Usage</span><span class="zhi">{{ item['cell'] }}%</span>
+ <span class="biao">{{ $t('Usage') }}</span><span class="zhi">{{ item['cell'] }}%</span>
</el-col>
<hr style="width:80%;margin: 0 auto;" />
<el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span class="biao">Space (Pieces)</span><span class="zhi">{{ item['state'] }}</span>
+ <span class="biao">{{ $t('Space (Pieces)') }}</span><span class="zhi">{{ item['state'] }}</span>
</el-col>
</div>
</div>
@@ -301,22 +296,32 @@
</el-footer>
<el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('order')">
- <el-input v-model="form.orderId" autocomplete="off" />
+
+ <el-form-item :label="$t('Barcodid')">
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
+ <el-button type="primary" @click="showform(3)">query</el-button>
</el-form-item>
- <el-form-item :label="$t('glassid')">
- <el-input v-model="form.glassId" autocomplete="off" />
+ <el-form-item :label="$t('order')">
+ <el-input v-model="form.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('length')">
- <el-input v-model="form.height" autocomplete="off" />
+ <el-input v-model="form.height" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('width')">
- <el-input v-model="form.width" autocomplete="off" />
+ <el-input v-model="form.width" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form.glassId" readonly autocomplete="off" />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="sbumitglassid()" type="primary">{{ $t('confirm') }}</el-button>
+ <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
+ type="primary">{{
+ $t('confirm') }}</el-button>
+ <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
+ type="primary">{{
+ $t('confirm') }}</el-button>
<el-button @click="cancal()">{{ $t('cancal') }}</el-button>
</span>
</template>
@@ -345,23 +350,28 @@
<el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
</el-table>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')">
+ <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
<el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column prop="cage" :label="$t('The Cage number')"></el-table-column>
- <el-table-column prop="cell" :label="$t('cell')"></el-table-column>
- <el-table-column prop="tier" :label="$t('tier')"></el-table-column>
- <el-table-column prop="glassId" :label="$t('glassid')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('order number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
- <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
- <el-table-column :label="$t('Operate')">
+ <el-table-column :width="90" prop="cage" :label="$t('The Cage number')"></el-table-column>
+ <el-table-column :width="90" prop="cell" :label="$t('The Slot Number')"></el-table-column>
+ <el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
+ <el-table-column :width="100" prop="glassId" :label="$t('Barcodid')"></el-table-column>
+ <el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
+ <el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>
+ <el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>
+ <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="280" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>
- <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="open">{{ $t('delete')
- }}</el-button> -->
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
+ {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('increase')
+ }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -369,8 +379,11 @@
</el-container>
</template>
<script>
-
-import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID } from "../../api/home";
+//:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false"
+import {
+ home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo,
+ SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID, Disabled, Inglassid
+} from "../../api/home";
import LanguageMixin from '../../lang/LanguageMixin'
@@ -379,6 +392,11 @@
name: "Home",
data() {
return {
+ confirm1: false,
+ confirm2: false,
+ insertcage: 0,
+ insertcell: 0,
+ inserttier: 0,
name: 'Confirm',
mixins: [LanguageMixin],
dialogFormVisible: false,
@@ -417,7 +435,7 @@
carlist: [],
loadglassheight: 0,
password: 1,
- text: "DataBase Connection failed",
+ text: "",
zhuangtai: ""
};
},
@@ -577,18 +595,24 @@
}
}
},
- showform() {
- if (this.glassid != "") {
- SelectGlassByGlassID(this.glassid).then(res => {
- if(res.data.form!=null){
- this.form = res.data.form;
- this.dialogFormVisible = true;
- }else{
- this.$message.error(this.$t('There is no such glass'));
- }
- });
-
+ showform(buttons) {
+ if (buttons == 1) {
+ this.confirm1 = true;
+ this.confirm2 = false;
+ } else if (buttons == 2) {
+ this.confirm1 = false;
+ this.confirm2 = true;
}
+ SelectGlassByGlassID(this.glassid).then(res => {
+ if (res.data.form != null) {
+ this.form = res.data.form;
+ this.dialogFormVisible = true;
+ this.$message.success('query was successful');
+ } else {
+ this.dialogFormVisible = true;
+ this.$message.error(this.$t('There is no such glass'));
+ }
+ });
},
showform1() {
if (this.order != "") {
@@ -692,6 +716,9 @@
else if (res.data.message2 == 300) {
this.$message.error(this.$t('There is no such grid'));
}
+ else if (res.data.message2 == 500) {
+ this.$message.error(this.$t('This glass is already in the cage'));
+ }
});
} else {
this.$message.error(this.$t('No out allowed'));
@@ -705,10 +732,60 @@
message: this.$t('Operation canceled')
});
});
+ },
+ insertglass(cage, cell, tier) {
+ this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(({ value }) => {
+ if (this.password == value) {
+ // OutByGlassID(glassid).then(res => {
+ // if (res.data.message3 == 200) {
+ // this.$message.success(this.$t('Operation successful'));
+ // }
+ // else if (res.data.message2 == 300) {
+ // this.$message.error(this.$t('There is no such grid'));
+ // }
+ // });
+ this.insertcage = cage;
+ this.insertcell = cell;
+ this.inserttier = tier;
+ this.showform(2);
+ } else {
+ this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ },
+ FeedInglassid() {
+ Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
+ if (this.form.glassId != "") {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ this.dialogFormVisible = false;
+ } else {
+ this.$message.error(this.$t('This glass is already in the cage'));
+ }
+ } else {
+ this.$message.error(this.$t('There is no such glass'));
+ }
+ });
+ },
+ UpdateDisabled(cage, cell, disabled) {
+ Disabled(cage, cell, disabled).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
}
}
-
}
-
</script>
\ No newline at end of file
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 d0a2b5d..32f0c4a 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
@@ -79,14 +79,14 @@
}
@GetMapping("/Addglassid")
- public Result Addglassid(short glassid) {
+ public Result Addglassid(String glassid) {
Map<String, Object> map = new HashMap<>();
short taskno = homeMapper.SelectInTask();
if (taskno > 0) {
map.put("message2", "500");
} else {
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results = spianService.selectAll(Short.toString(glassid));
+ short results = spianService.selectAll(glassid);
if (results == 200) {
map.put("message2", "200");
} else if (results == 300) {
@@ -99,19 +99,19 @@
}
@GetMapping("/UpdateTask")
- public Result UpdateTask(Integer types, Integer shelfrack, Integer glassid) {
+ public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types);
- StorageCage glass=homeMapper.SelectGlassInfo(glassid);
+ StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
// spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
homeMapper.UpdateCageTask1(glassid);
- S7control.getinstance().WriteWord("DB105.14",(short)0);
+ S7control.getinstance().WriteWord("DB105.14", (short) 0);
} else {
-
- spianMapper.UpdataOutCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+
+ spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
homeMapper.UpdateCageTask2(glassid);
- S7control.getinstance().WriteWord("DB105.12",(short)0);
+ S7control.getinstance().WriteWord("DB105.12", (short) 0);
}
map.put("message3", "200");
return Result.success(map);
@@ -134,10 +134,10 @@
}
@GetMapping("/DeleteByGlassID")
- public Result DeleteByGlassID(short glassid) {
- StorageCage glassinfor= homeMapper.SelectGlassInfo(Integer.valueOf(glassid));
- spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(),glassinfor.getCage(),glassinfor.getCell());
- homeMapper.DeleteByGlassID(glassid);
+ public Result DeleteByGlassID(String glassid) {
+ StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+ spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+ homeMapper.DeleteByGlassID(glassid);
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
return Result.success(map);
@@ -147,14 +147,18 @@
public Result OutByGlassID(String glassid) {
Map<String, Object> map = new HashMap<>();
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- Short results = spianService.selectout2(glassid);
- if (results == 200) {
- map.put("message2", "200");
- } else if (results == 300) {
- map.put("message2", "300");
- } else if (results == 400) {
- map.put("message2", "400");
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ Short results = spianService.selectout2(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ }
+ }else{
+ map.put("message2", "500");
}
+
return Result.success(map);
}
@@ -173,7 +177,7 @@
map.put("password", pwdct);
return Result.success(map);
}
-
+
@GetMapping("/SelectGlassByGlassID")
public Result SelectGlassByGlassID(String glassid) {
Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
@@ -181,4 +185,26 @@
map.put("form", Glass);
return Result.success(map);
}
+
+ @GetMapping("/Disabled")
+ public Result Disabled(short cage, short cell, short disabled) {
+ homeMapper.Disabled(cage, cell, disabled);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ @PostMapping("/Inglassid")
+ public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.Inglassid(glass, cage, cell, tier);
+ spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell);
+ }
+ return Result.success(map);
+ }
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
index 7324151..1dad942 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -5,7 +5,7 @@
private Short orderId;
private double glassWidth;
private double glassHeight;
- private Short glassId;
+ private String glassId;
@@ -43,11 +43,11 @@
this.glassWidth = glassWidth;
}
- public Short getGlassId() {
+ public String getGlassId() {
return glassId;
}
- public void setGlassId(Short glassId) {
+ public void setGlassId(String glassId) {
this.glassId = glassId;
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
index 24fd64c..2c952ab 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
@@ -12,7 +12,7 @@
private String state;
private Integer tier;
private String orderId;
- private String coating;
+ private Integer disabled;
private String lengthWidth;
public Integer id() {
@@ -107,12 +107,12 @@
this.glassheight = glassheight;
}
- public String getCoating() {
- return coating;
+ public Integer getDisabled() {
+ return disabled;
}
- public void setCoating(String coating) {
- this.coating = coating;
+ public void setDisabled(Integer disabled) {
+ this.disabled = disabled;
}
public String getLengthWidth() {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index ac6d21a..f3bd4c0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -57,11 +57,11 @@
// 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
@Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
- void UpdateCageTask1(@Param("glassid") Integer glassid);
+ void UpdateCageTask1(@Param("glassid") String glassid);
// 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
- @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where glass_id=#{glassid} and state=3")
- void UpdateCageTask2(@Param("glassid") Integer glassid);
+ @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid} and state=3")
+ void UpdateCageTask2(@Param("glassid") String glassid);
//鑾峰彇鎶ヨ淇℃伅
@Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
@@ -71,19 +71,35 @@
@Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage ")
List<StorageCage> SelectCageInfo(short cage);
- @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where glass_id=#{glassid}")
- void DeleteByGlassID(short glassid);
+ @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
+ void DeleteByGlassID(String glassid);
+ //鏌ヨ灏忚溅浣嶇疆
@Select("select * from car_position")
List<CarPosition> Loadcarlist();
+ //鏌ヨ鎿嶄綔瀵嗙爜
@Select("select dianqimima from user where id=1")
String SelectPassword();
+ //鏍规嵁鐜荤拑id鏌ヨ鐞嗙墖绗间俊鎭�
@Select("select * from storage_cage where glass_id=#{glassid}")
- StorageCage SelectGlassInfo(Integer glassid);
+ StorageCage SelectGlassInfo(String glassid);
+ //鏌ヨ鐜荤拑淇℃伅
@Select("select * from glass where glassid=#{glassid}")
Glass SelectGlassByGlassID(String glassid);
+ //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
+ @Update("update storage_cage set disabled=#{disabled} where cage=#{cage} and cell=#{cell}")
+ void Disabled(short cage, short cell, short disabled);
+
+ //鐞嗙墖绗兼柊澧炵幓鐠�
+ @Update("update storage_cage set state=1,glass_id=#{glass.glassId},order_id=#{glass.orderId},glasswidth=#{glass.width},glassheight=#{glass.height} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
+ void Inglassid(Glass glass, short cage, short cell, short tier);
+
+ //鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
+ @Select("select count(*) from storage_cage where glass_id=#{glassId}")
+ short SelectStorageByGlassId(String glassId);
+
}
--
Gitblit v1.8.0