From 01bfed8b9977f82d4e13afd9ce95869d34044d2b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 31 三月 2024 13:23:47 +0800
Subject: [PATCH] 修改玻璃id命名规则，添加领取任务线路选择
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 f47de89..22af7d8 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
@@ -1,6 +1,7 @@
package com.example.springboot.controller;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -16,6 +17,11 @@
import com.example.springboot.service.OutSliceServive;
import com.example.springboot.service.SpianService;
import com.example.springboot.service.StorageCageService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
+import cn.hutool.core.lang.Console;
import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
@@ -473,8 +479,8 @@
//棰嗗彇/鏆傚仠浠诲姟
@PostMapping("/ClaimTasks")
- public Result ClaimTasks(String flowcard,Integer state) {
- return storageCageService.ClaimTasks(flowcard,state);
+ public Result ClaimTasks(String flowcard,Integer state, Integer line) {
+ return storageCageService.ClaimTasks(flowcard,state,line);
}
//淇敼鍑虹墖鏂瑰紡
@@ -482,10 +488,25 @@
public Result ModeChange(String flowcard,Integer method) {
return storageCageService.ModeChange(flowcard,method);
}
-
+
//娣诲姞鐜荤拑淇℃伅鍒版祴閲忎俊鎭�
@PostMapping("/UpdateQueue")
public Result UpdateQueue(@RequestBody GlassInfo glassInfo) {
return storageCageService.UpdateQueue(glassInfo);
}
+ //浜哄伐鎷胯蛋
+ @PostMapping("/ManualTake")
+ public Result ManualTake(@RequestBody String glassInfo) {
+ return storageCageService.ManualTake(glassInfo);
+ }
+ //閲嶆柊娴嬮噺
+ @PostMapping("/AnewMeasure")
+ public Result AnewMeasure(@RequestBody String glassInfo) {
+ return storageCageService.AnewMeasure(glassInfo);
+ }
+ //瀵煎叆鏁版嵁 锛氭坊鍔犵幓鐠冧俊鎭�
+ @PostMapping("/importData")
+ public Result importData(@RequestBody List<Map> IportDataStr) {
+ return storageCageService.AddGlassinfo(IportDataStr);
+ }
}
--
Gitblit v1.8.0