From ef5dda6db97f89c09a714b9304f302c00ee4ac6c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 一月 2024 13:53:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 100ac98..a6d32b8 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
@@ -6,11 +6,9 @@
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoProperties.Storage;
import org.springframework.stereotype.Service;
import com.example.springboot.common.Result;
-import com.example.springboot.component.S7control;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.mapper.HomeMapper;
@@ -26,8 +24,6 @@
@Autowired
SpianService spianService;
- @Autowired
- private JdbcConnections jdbcConnections;
public void AddOutSliceS(String[][] AluminumFrames) throws SQLException {
// int sequence = homeMapper.SelectMaxSquence();
@@ -70,6 +66,16 @@
return Result.success(map);
}
+ // 纭鍚庡畬鎴愪慨鏀瑰嚭鐗囬槦鍒楃姸鎬�
+ public void CompleteQueueByGlassId(String glassid) {
+ homeMapper.CompleteQueueByGlassId(glassid);
+ Out_slice outslice=homeMapper.SelectQueueByglassid(glassid);
+ Short num = homeMapper.SelectCountByFrameNo(outslice.getBarCode());
+ if (num == 0) {
+ homeMapper.CompleteQueueByFrameNo(outslice.getBarCode());
+ }
+ }
+
//缁堟杩涚墖/鍑虹墖
public void StopTask(String glassid, int i) {
if (i == 0) {// 杩涚墖缁堟
@@ -92,4 +98,11 @@
homeMapper.DeleteByGlassID(glassid);
}
+public Result FrameStateUpdate(String frameno, String framestate) {
+ homeMapper.FrameStateUpdate(frameno, framestate);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+}
+
}
--
Gitblit v1.8.0