From 4b4545d1e3ad228ba819e3313853a6e987ef36e6 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 20 九月 2023 01:19:50 +0800 Subject: [PATCH] 1,取消在开始进片或出片时结束之前的任务,改为进片车或出片车变空闲后立即结束数据库任务表的任务状态; 2,手动删除玻璃时恢复数据库理片笼信息中的剩余宽度 --- springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java index 9a7de54..7ab5b9a 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java +++ b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java @@ -1,22 +1,15 @@ package com.example.springboot.controller; -import com.example.springboot.common.Result; -import com.example.springboot.component.S7control; -import com.example.springboot.entity.StorageCage; import com.example.springboot.mapper.SpianMapper; import com.example.springboot.service.SpianService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; + import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; + @RestController @RequestMapping("/spian") @@ -31,7 +24,7 @@ @GetMapping("/all2") public void selectdd(String orderid){ SpianService service=new SpianService(); - service.selectadd(orderid); + service.selectout(orderid); } @@ -40,7 +33,7 @@ //鎸夎鍗曚紭鍏堣繘鐗� public void selectAll(Short glassid){ SpianService service=new SpianService(); - service.selectAll(glassid); + service.selectAll(Short.toString(glassid)); } -- Gitblit v1.8.0