From 2d0800d8a425abe45ac13b3f7257eced1d51c7bd Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 11 十二月 2023 10:58:04 +0800
Subject: [PATCH] 调整手动完成任务逻辑
---
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 e29eb16..4e670f0 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,17 +6,23 @@
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;
+import com.example.springboot.mapper.SpianMapper;
@Service
public class OutSliceServive {
@Autowired
private HomeMapper homeMapper;
+ @Autowired
+ private SpianMapper spianMapper;
@Autowired
private JdbcConnections jdbcConnections;
@@ -43,15 +49,20 @@
return listoutslice;
}
-public Result CompleteQueue(String id, String frameid) {
- homeMapper.CompleteQueue(id);
- Short num=homeMapper.SelectCountByFrameNo(frameid);
- if(num==0){
- homeMapper.CompleteQueueByFrameNo(frameid);
+ public Result CompleteQueue(String id, String frameid, String glassid) {
+ homeMapper.CompleteQueue(id);
+ Short num = homeMapper.SelectCountByFrameNo(frameid);
+ if (num == 0) {
+ homeMapper.CompleteQueueByFrameNo(frameid);
+ }
+ StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
+ spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
+
+ homeMapper.UpdateCageTask2(glassid);
+ S7control.getinstance().WriteWord("DB105.12", (short) 0);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
}
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
-}
}
--
Gitblit v1.8.0