From ad97e59dc3198f90f685c6538998624fa07cc199 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期四, 07 十二月 2023 13:09:00 +0800 Subject: [PATCH] 出片队列添加手动完成任务 --- springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java index ed546f4..e29eb16 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java +++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java @@ -1,11 +1,15 @@ package com.example.springboot.service; import java.sql.SQLException; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.example.springboot.common.Result; +import com.example.springboot.entity.Out_slice; import com.example.springboot.mapper.HomeMapper; @Service @@ -19,7 +23,7 @@ public void AddOutSliceS(String[][] AluminumFrames) throws SQLException { int sequence = homeMapper.SelectMaxSquence(); - + // 娣诲姞鍒版暟鎹簱 for (String[] item : AluminumFrames) { if (item[1] == "true") { @@ -30,6 +34,24 @@ } } - + // 鏌ヨ鍑虹墖闃熷垪 + public List<Out_slice> SelectProductionqueue() { + List<Out_slice> listoutslice = homeMapper.SelectProductionqueue(); + for (Out_slice out_slice : listoutslice) { + out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId())); + } + return listoutslice; + } + +public Result CompleteQueue(String id, String frameid) { + homeMapper.CompleteQueue(id); + Short num=homeMapper.SelectCountByFrameNo(frameid); + if(num==0){ + homeMapper.CompleteQueueByFrameNo(frameid); + } + Map<String, Object> map = new HashMap<>(); + map.put("message", "200"); + return Result.success(map); +} } -- Gitblit v1.8.0