From 5a427c9d36d3712ec6185e14637cb8b4d0183fe8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 三月 2024 12:24:07 +0800
Subject: [PATCH] 修改主页面
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index 09efc5f..14acc27 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -12,7 +12,7 @@
import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
-import com.example.springboot.entity.Flowcard;
+import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
@@ -237,7 +237,7 @@
}
//鎵嬪姩瀹屾垚浠诲姟
- public Result FinishTask(Integer tasktype, Integer id) {
+ public Result FinishTask(Integer id) {
StorageTask storageTask = homeMapper.SelectStorageTaskById(id);//鑾峰彇浠诲姟淇℃伅
homeMapper.FinishTask(storageTask.getId());//瀹屾垚浠诲姟
if(storageTask.getTaskType().equals("0")){
@@ -249,6 +249,7 @@
}else{
UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()),0);//娓呴櫎鏍煎唴淇℃伅
}
+ homeMapper.AddGlassNo(storageTask.getFlowcard(),storageTask.getMateid(),storageTask.geTier());//娣诲姞鍑虹墖瀹屾垚鏁伴噺
}
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -273,14 +274,16 @@
return Result.success(map);
}
- public List<Flowcard> SelectOrderTask() {
- List<Flowcard> OrderTask=homeMapper.SelectOrderTask();
- for (Flowcard flowcard : OrderTask) {
+ //鏌ヨ璁㈠崟浠诲姟
+ public List<FlowCard> SelectOrderTask() {
+ List<FlowCard> OrderTask=homeMapper.SelectOrderTask();
+ for (FlowCard flowcard : OrderTask) {
flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
}
return OrderTask;
}
+ //寮�濮嬩换鍔�
public Result ClaimTasks(String flowcard, Integer state) {
if(state==1){
homeMapper.ClaimTasks(flowcard,0);
@@ -292,6 +295,7 @@
return Result.success(map);
}
+ //浠诲姟妯″紡淇敼
public Result ModeChange(String flowcard, Integer method) {
if(method==1){
homeMapper.ModeChange(flowcard,0);
@@ -303,6 +307,7 @@
return Result.success(map);
}
+ //淇敼娴嬮噺淇℃伅
public Result UpdateQueue(GlassInfo glassInfo) {
homeMapper.UpdateQueue(glassInfo.getFlowcard(),glassInfo.getWidth(),glassInfo.getHeight(),glassInfo.getGlasstype());
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0