From fa356bb65f2bc425e866ceb0fc3acf44caca0edd Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 05 九月 2023 15:14:44 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
/dev/null | 22 -
springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java | 46 +++
CanadaMes-ui/src/views/home/index.vue | 340 ++++++++++++++++------------
springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java | 9
CanadaMes-ui/src/api/home.js | 17 +
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 83 ++++++
springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java | 54 ++++
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 44 +++
CanadaMes-ui/src/views/home/xmjc.png | 0
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 68 +++++
10 files changed, 512 insertions(+), 171 deletions(-)
diff --git a/CanadaMes-ui/src/api/home.js b/CanadaMes-ui/src/api/home.js
index 51a793c..88450d9 100644
--- a/CanadaMes-ui/src/api/home.js
+++ b/CanadaMes-ui/src/api/home.js
@@ -7,17 +7,30 @@
*/
export function home(data) {
return request({
- url: '/storageRack/load',
+ url: '/home/load',
method: 'get',
data
})
}
export function home2(data) {
return request({
- url: '/storageRack/loads',
+ url: '/home/loads',
method: 'get',
data
})
}
+export function loadtask(type) {
+ return request({
+ url: '/home/loadinout?types=' + type,
+ method: 'get',
+ })
+}
+export function InsertOrder(orderid) {
+ return request({
+ url: '/home/InsertOrder?orderid=' + orderid,
+ method: 'get',
+ data :""
+ })
+}
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index da35287..e3a2c1b 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -1,176 +1,222 @@
<style>
-*{
- margin:0;
- padding:0;
-
+* {
+ margin: 0;
+ padding: 0;
}
-.occupy{
- height:100%;
- width:10%;
- background-color:white;
+
+.occupy {
+ height: 100%;
+ width: 10%;
+ background-color: white;
margin: 0px 8px 0px 8px;
- border:1px black solid;
- text-align:center;
+ border: 1px black solid;
+ text-align: center;
padding: 5px;
}
-.el-col{
- margin-top:7px;
+
+.el-col {
+ margin-top: 4px;
}
-.biao{
- font-size:12px;
+
+.biao {
+ font-size: 12px;
}
-.zhi{
- font-size:18px;
+
+.zhi {
+ font-size: 18px;
font-weight: bold;
}
-.el-main{
- --el-main-padding: 0px;
+
+.el-main {
+ padding: 3px;
+ min-height: 40vh;
}
-.green{
- background-color:green;
+.el-footer {
+ max-height: 60vh;
+ padding: 0px;
+ margin: 0px;
}
-.blue{
- background-color:blue;
+.green {
+ background-color: green;
}
-.red{
- background-color:red;
+
+.blue {
+ background-color: blue;
}
-.yellow{
- background-color:yellow;
+
+.red {
+ background-color: red;
}
-.gezi{
- height:25px;
- width: 2.02px;
+
+.yellow {
+ background-color: yellow;
}
+
+.black {
+ background-color: black;
+}
+
+.gezi {
+ height: 23px;
+ width: 1.74px;
+}
+
.gezi:nth-child(22) {
- margin-left:4px;
+ margin-left: 4px;
}
+
.gezi:nth-child(43) {
- margin-left:4px;
+ margin-left: 4px;
}
+
.gezi:nth-child(64) {
- margin-left:4px;
+ margin-left: 4px;
}
+
.gezi:nth-child(85) {
- margin-left:4px;
+ margin-left: 4px;
+}
+
+.block {
+ min-height: 50vh;
+ max-width: 100vw;
+ background-image: url('xmjc.png');
+ margin: 0px;
+ background-repeat:no-repeat ;
+ background-size:100% 100%;
+ background-attachment:local;
}
</style>
<template>
- <el-container style=" height:90%;
- width:100%;">
- <!-- <el-header style="padding: 10px;"></el-header> -->
- <el-main>
- <div style="display:flex;justify-content: space-around;width: 75%;margin: 0 auto;">
- <el-input style="width:15%;" placeholder="Enter the glass lD"></el-input>
- <el-button type="primary">Manually feed the glass</el-button>
- <el-input style="width:15%;" placeholder="Enter the order number"></el-input>
- <el-button type="warning">Exit the glass by order number</el-button>
- </div>
- <div>
- <el-table :data="tableData" border style="width: 100%">
- <el-table-column prop="date" label="Coming out glass ID"></el-table-column>
- <el-table-column prop="name" label="The Grille number being used"></el-table-column>
- <el-table-column prop="address" label="Order number"></el-table-column>
- <el-table-column prop="address" label="Length and width"></el-table-column>
- <el-table-column prop="address" label="coating"></el-table-column>
- </el-table>
- <el-table :data="tableData" border style="width: 100%">
- <el-table-column prop="date" label="Incoming glass ID"></el-table-column>
- <el-table-column prop="name" label="The Grille number being used"></el-table-column>
- <el-table-column prop="address" label="Order number"></el-table-column>
- <el-table-column prop="address" label="Length and width"></el-table-column>
- <el-table-column prop="address" label="coating"></el-table-column>
- </el-table>
- </div>
- <div style="padding: 10px;display: flex;height:120px;">
- <div v-for="item in tableData" :key="item['cageno']" class="occupy">
- <el-col style="text-align:left;font-weight: bold;">#{{ item['cageno'] }}</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>
- </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['falg'] }}</span>
- </el-col>
- </div>
- </div>
- </el-main>
- <el-footer>
- <div class="demo-image__placeholder" style="text-align: center;">
- <div class="block">
- <el-image :src="require('@/img/xmjc.png')" style="height: 400px;"></el-image>
- </div>
- </div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:435px;left:531px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"></div>
- </div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:435px;left: 794.2px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"></div>
- </div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:462px;left:531px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"></div>
- </div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:462px;left: 794.2px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"></div>
- </div>
- </el-footer>
- </el-container>
- </template>
+ <el-container>
+ <!-- <el-header style="padding: 10px;"></el-header> -->
+ <el-main>
+ <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
+ <el-input style="width:15%;" placeholder="Enter the glass lD"></el-input>
+ <el-button type="primary">Manually feed the glass</el-button>
+ <el-input style="width:15%;" placeholder="Enter the order number" v-model="order"></el-input>
+ <el-button type="warning" @click="getOrder()">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="Coming out glass ID"></el-table-column>
+ <el-table-column prop="cage" label="The Grille number being used"></el-table-column>
+ <el-table-column label="Order number">orderNo</el-table-column>
+ <el-table-column prop="address" label="Length and width"></el-table-column>
+ <el-table-column prop="address" label="coating"></el-table-column>
+ </el-table>
+ <el-table :data="this.tasklist2" border style="width: 100%">
+ <el-table-column prop="glassId" label="Incoming glass ID"></el-table-column>
+ <el-table-column prop="cage" label="The Grille number being used"></el-table-column>
+ <el-table-column label="Order number">orderNo</el-table-column>
+ <el-table-column prop="address" label="Length and width"></el-table-column>
+ <el-table-column prop="address" label="coating"></el-table-column>
+ </el-table>
+ </div>
+ <div style="padding: 10px;display: flex;height:85px;">
+ <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>
+ </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>
+ </el-col>
+ </div>
+ </div>
+ </el-main>
+ <el-footer>
+ <div class="block" style="text-align: center;position: relative;">
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:71px;left:136px;">
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"></div>
+ </div>
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:71px;left:366px;">
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"></div>
+ </div>
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:96px;left:136px;">
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"></div>
+ </div>
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:96px;left:366px;">
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"></div>
+ </div>
+ </div>
+ </el-footer>
+ </el-container>
+</template>
- <script>
+<script>
- import {home,home2} from "../../api/home";
+import { home, home2, loadtask, InsertOrder } from "../../api/home";
-
- export default {
- data() {
- return {
- tableData: [],
- cagelist1: [],
- cagelist2: [],
- cagelist3: [],
- cagelist4: [],
- form: {},
- src: "./img/xmjc.png"
- };
- },
- created() {
- this.load();
- },
- methods: {
- load() {
-// request.get("api/storageRack/load").then((res) => {
-// this.tableData = res.data.list;
-// });
-// request.get("/storageRack/loads").then((res) => {
-// this.cagelist1 = res.data.list1;
-// this.cagelist2 = res.data.list2;
-// this.cagelist3 = res.data.list3;
-// this.cagelist4 = res.data.list4;
-// });
-home().then(res => {
- console.log(res.data.list);
- this.tableData = res.data.list;
- });
- home2().then(res => {
- this.cagelist1 = res.data.list1;
- this.cagelist2 = res.data.list2;
- this.cagelist3 = res.data.list3;
- this.cagelist4 = res.data.list4;
- });
- },
- getStatusClass(state) {
- if (state === 0) {
- return "green gezi";
- } else if (state === 1) {
- return "blue gezi";
- } else if (state === 2) {
- return "red gezi";
- } else {
- return "yellow gezi";
- }
- }
- }
- };
- </script>
\ No newline at end of file
+export default {
+ data() {
+ return {
+ tableData: [],
+ cagelist1: [],
+ cagelist2: [],
+ cagelist3: [],
+ cagelist4: [],
+ form: {},
+ task1: 3,
+ task2: 4,
+ tasklist1: [],
+ tasklist2: [],
+ src: "./img/xmjc.png",
+ order: ""
+ };
+ },
+ created() {
+ this.load();
+ },
+ methods: {
+ load() {
+ home().then(res => {
+ this.tableData = res.data.list;
+ });
+ home2().then(res => {
+ this.cagelist1 = res.data.list1;
+ this.cagelist2 = res.data.list2;
+ this.cagelist3 = res.data.list3;
+ this.cagelist4 = res.data.list4;
+ });
+ loadtask(this.task1).then(res => {
+ this.tasklist1 = res.data.list;
+ });
+ loadtask(this.task2).then(res => {
+ this.tasklist2 = res.data.list;
+ });
+ },
+ getStatusClass(state) {
+ //姣忓悇鏍煎瓙涓嶅悓鐘舵�佷笉鍚岄鑹�
+ if (state == 0) {
+ return "green gezi";
+ } else if (state == 1) {
+ return "blue gezi";
+ } else if (state == 2) {
+ return "yellow gezi";
+ } else if (state == 3) {
+ return "red gezi";
+ } else {
+ return "black gezi";
+ }
+ },
+ getOrder() {
+ if(this.order!=""){
+ InsertOrder(this.order).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success("Operation successful");
+ } else {
+ this.$message.success("operation failed");
+ }
+ this.load();
+ });
+ }
+
+ }
+ }
+};
+
+
+</script>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/home/xmjc.png b/CanadaMes-ui/src/views/home/xmjc.png
new file mode 100644
index 0000000..3a682f5
--- /dev/null
+++ b/CanadaMes-ui/src/views/home/xmjc.png
Binary files differ
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
new file mode 100644
index 0000000..4102de3
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -0,0 +1,68 @@
+package com.example.springboot.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.service.HomeService;
+import com.example.springboot.common.Result;
+import com.example.springboot.entity.StorageCage;
+
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/home")
+public class HomeController {
+ @Autowired
+ HomeMapper homeMapper;
+
+ @Autowired
+ HomeService storageRackService;
+
+ @GetMapping("/load")
+ public Result selectAll(){
+ List<StorageCage> storageCagelist=homeMapper.selectAll();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list",storageCagelist);
+ return Result.success(map);
+ }
+
+ @GetMapping("/loads")
+ public Result selectRack(){
+ List<StorageCage> storageCagelist1=homeMapper.selectRack1();
+ List<StorageCage> storageCagelist2=homeMapper.selectRack2();
+ List<StorageCage> storageCagelist3=homeMapper.selectRack3();
+ List<StorageCage> storageCagelist4=homeMapper.selectRack4();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list1",storageCagelist1);
+ map.put("list2",storageCagelist2);
+ map.put("list3",storageCagelist3);
+ map.put("list4",storageCagelist4);
+ return Result.success(map);
+ }
+
+ @GetMapping("/loadinout")
+ public Result selectinout(Integer types){
+ List<StorageCage> storageCageinout=homeMapper.selectinout(types);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list",storageCageinout);
+ return Result.success(map);
+ }
+
+ @GetMapping("/InsertOrder")
+ public Result InsertOrder(String orderid){
+ short result=homeMapper.SelectOrder(orderid);
+ Map<String, Object> map = new HashMap<>();
+ if(result>0){
+ homeMapper.updateOrder();
+ homeMapper.InsertOrder(orderid);
+ map.put("message","200");
+ }else{
+ map.put("message","500");
+ }
+ return Result.success(map);
+ }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/StorageRackController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/StorageRackController.java
deleted file mode 100644
index 61e2c68..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/StorageRackController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.example.springboot.controller;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.example.springboot.mapper.StorageRackMapper;
-import com.example.springboot.service.StorageRackService;
-import com.example.springboot.common.Result;
-import com.example.springboot.entity.StorageRack;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("/storageRack")
-public class StorageRackController {
- @Autowired
- StorageRackMapper storageRackMapper;
-
- @Autowired
- StorageRackService storageRackService;
-
- @GetMapping("/load")
- public Result selectAll(){
- List<StorageRack> storageRacklist=storageRackMapper.selectAll();
- Map<String, Object> map = new HashMap<>();
- map.put("list",storageRacklist);
- return Result.success(map);
- }
-
- @GetMapping("/loads")
- public Result selectRack(){
- List<StorageRack> storageRacklist1=storageRackMapper.selectRack1();
- List<StorageRack> storageRacklist2=storageRackMapper.selectRack2();
- List<StorageRack> storageRacklist3=storageRackMapper.selectRack3();
- List<StorageRack> storageRacklist4=storageRackMapper.selectRack4();
- Map<String, Object> map = new HashMap<>();
- map.put("list1",storageRacklist1);
- map.put("list2",storageRacklist2);
- map.put("list3",storageRacklist3);
- map.put("list4",storageRacklist4);
- return Result.success(map);
- }
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java b/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
new file mode 100644
index 0000000..381fe7f
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
@@ -0,0 +1,46 @@
+package com.example.springboot.entity;
+
+import java.sql.Date;
+
+public class OrderOut {
+ private Integer id;
+ private String orderid;
+ private Integer state;
+ private Date modtime;
+
+ public Integer id() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setOrderId(String orderid) {
+ this.orderid = orderid;
+ }
+
+ public String getOrderId() {
+ return orderid;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setModTime(Date modtime) {
+ this.modtime = modtime;
+ }
+
+ public Date getModTime() {
+ return modtime;
+ }
+}
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
new file mode 100644
index 0000000..d3e0d0b
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
@@ -0,0 +1,83 @@
+package com.example.springboot.entity;
+
+public class StorageCage {
+ private Integer id;
+ private String glassId;
+ private String cage;
+ private String cell;
+ //private String height;
+ private String width;
+ private String state;
+ private String tier;
+
+
+ public Integer id() {
+ return id;
+ }
+ public void setId(Integer id) {
+ this.id = id;
+ }
+ public Integer getId() {
+ return id;
+ }
+
+ public String getGlassId() {
+ return glassId;
+ }
+
+ public void setGlassId(String glassId) {
+ this.glassId = glassId;
+ }
+
+ public String getCage() {
+ return cage;
+ }
+
+ public void setGage(String cage) {
+ this.cage = cage;
+ }
+
+ public void setCell(String cell) {
+ this.cell = cell;
+ }
+
+ public String getCell() {
+ return cell;
+ }
+
+
+
+ // public String getHeighth() {
+ // return height;
+ // }
+
+ // public void setHeight(String height) {
+ // this.height = height;
+ // }
+
+ public String getWidth() {
+ return width;
+ }
+
+ public void setWidth(String width) {
+ this.width = width;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getTier() {
+ return tier;
+ }
+
+ public void setTier(String tier) {
+ this.tier = tier;
+ }
+
+
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageRack.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageRack.java
deleted file mode 100644
index 3a53bae..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageRack.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.example.springboot.entity;
-
-import java.sql.Date;
-
-public class StorageRack{
-
- /** $column.columnComment */
- private Long id;
-
- /** 鏋跺瓙缂栧彿 */
- private Long number;
-
- /** 鐘舵�� */
- private Long state;
-
- /** 鍖呭彿缂栧彿 */
- private Long rawPackageId;
-
- /** 淇敼鏃堕棿 */
- private Date modTime;
-
- /** 绂佺敤鍚敤 */
- private String falg;
-
- /** $column.columnComment */
- private Long cell;
-
- /** 鏍煎瓙 */
- private Long cageno;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setNumber(Long number)
- {
- this.number = number;
- }
-
- public Long getNumber()
- {
- return number;
- }
- public void setState(Long state)
- {
- this.state = state;
- }
-
- public Long getState()
- {
- return state;
- }
- public void setRawPackageId(Long rawPackageId)
- {
- this.rawPackageId = rawPackageId;
- }
-
- public Long getRawPackageId()
- {
- return rawPackageId;
- }
- public void setModTime(Date modTime)
- {
- this.modTime = modTime;
- }
-
- public Date getModTime()
- {
- return modTime;
- }
- public void setFalg(String falg)
- {
- this.falg = falg;
- }
-
- public String getFalg()
- {
- return falg;
- }
- public void setCell(Long cell)
- {
- this.cell = cell;
- }
-
- public Long getCell()
- {
- return cell;
- }
- public void setCageno(Long cageno)
- {
- this.cageno = cageno;
- }
-
- public Long getCageno()
- {
- return cageno;
- }
-}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
new file mode 100644
index 0000000..ec9a836
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
@@ -0,0 +1,54 @@
+package com.example.springboot.entity;
+
+public class StorageTask{
+ private Integer id;
+ private String taskType;
+ private String cataskStatege;
+ private String shelfRack;
+ private String loadrack;
+
+ public Integer id() {
+ return id;
+ }
+ public void setId(Integer id) {
+ this.id = id;
+ }
+ public Integer getId() {
+ return id;
+ }
+
+ public String getTaskType() {
+ return taskType;
+ }
+
+ public void setTaskType(String taskType) {
+ this.taskType = taskType;
+ }
+
+ public String getCataskStatege() {
+ return cataskStatege;
+ }
+
+ public void setCataskStatege(String cataskStatege) {
+ this.cataskStatege = cataskStatege;
+ }
+
+ public String getShelfRack() {
+ return shelfRack;
+ }
+
+ public void setShelfRack(String shelfRack) {
+ this.shelfRack = shelfRack;
+ }
+
+ public String getLoadrack() {
+ return loadrack;
+ }
+
+ public void setLoadrack(String loadrack) {
+ this.loadrack = loadrack;
+ }
+
+
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..112af50
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -0,0 +1,44 @@
+package com.example.springboot.mapper;
+
+import org.apache.ibatis.annotations.*;
+
+import com.example.springboot.entity.StorageCage;
+
+import java.util.List;
+
+@Mapper
+public interface HomeMapper {
+ @Select("SELECT cage,round(round(sum(state)/42,2)*100) as cell,42-sum(state) as state FROM storage_cage group by cage")
+ List<StorageCage> selectAll();
+
+ //鏌ヨ1-5绗煎唴灞傛牸瀛愮姸鎬�
+ @Select("SELECT state from storage_cage where cage<=5 and tier=1")
+ List<StorageCage> selectRack1();
+
+ //鏌ヨ6-10绗煎唴灞傛牸瀛愮姸鎬�
+ @Select("SELECT state from storage_cage where cage>5 and tier=1")
+ List<StorageCage> selectRack2();
+
+ //鏌ヨ1-5绗煎灞傛牸瀛愮姸鎬�
+ @Select("SELECT state from storage_cage where cage<=5 and tier=2")
+ List<StorageCage> selectRack3();
+
+ //鏌ヨ6-10绗煎灞傛牸瀛愮姸鎬�
+ @Select("SELECT state from storage_cage where cage>5 and tier=2")
+ List<StorageCage> selectRack4();
+
+ // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
+ @Select("select * from storage_cage where state=#{task_type} limit 1")
+ List<StorageCage> selectinout(@Param("task_type") Integer task_type);
+
+ // 鏌ヨ鏄惁瀛樺湪姝よ鍗�
+ @Select("select count(*) from storage_cage where order_id=#{orderid} and state=0")
+ short SelectOrder(@Param("orderid") String orderid);
+
+ // @Insert("insert into order_out(orderid) values('#{orderid}')")
+ @Insert("INSERT INTO `canadames`.`order_out`( `orderid`,`mod_time`) VALUES ( #{orderid},now())")
+ void InsertOrder(String orderid);
+
+ @Update("update order_out set state=1 where state=0")
+ void updateOrder();
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/StorageRackMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/StorageRackMapper.java
deleted file mode 100644
index 0504f88..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/StorageRackMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.example.springboot.mapper;
-
-import com.example.springboot.entity.StorageRack;
-
-import org.apache.ibatis.annotations.*;
-
-import java.util.List;
-
-@Mapper
-public interface StorageRackMapper{
- @Select("SELECT cageno,round(round(1-sum(state)/42,2)*100) as cell,42-sum(state) as falg FROM storage_rack group by cageno")
- List<StorageRack> selectAll();
-
- @Select("SELECT state from storage_rack where cageno<=5 and cell=1")
- List<StorageRack> selectRack1();
-
- @Select("SELECT state from storage_rack where cageno>5 and cell=1")
- List<StorageRack> selectRack2();
-
- @Select("SELECT state from storage_rack where cageno<=5 and cell=2")
- List<StorageRack> selectRack3();
-
- @Select("SELECT state from storage_rack where cageno>5 and cell=2")
- List<StorageRack> selectRack4();
-
- void insert(StorageRack storageRack);
-
- void update(StorageRack storageRack);
-}
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
new file mode 100644
index 0000000..0daec53
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
@@ -0,0 +1,9 @@
+package com.example.springboot.service;
+
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class HomeService {
+
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageRackService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageRackService.java
deleted file mode 100644
index fd6cb22..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageRackService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.example.springboot.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.example.springboot.entity.StorageRack;
-import com.example.springboot.mapper.StorageRackMapper;
-
-@Service
-public class StorageRackService {
- @Autowired
- private StorageRackMapper storageRackMapper;
-
-
- public void Save(StorageRack user) {
- if (user.getId() == null) {
- storageRackMapper.insert(user);
- } else {
- storageRackMapper.update(user);
- }
- }
-}
--
Gitblit v1.8.0