From 3cbdeaa5e8983ea5071ea446813ef5215b9822a0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 25 十二月 2023 14:39:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index d7ffc4e..f6b9988 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -3,52 +3,56 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
import com.example.springboot.mapper.HomeMapper;
-import org.springframework.stereotype.Service;
@Service
public class StorageCageService {
@Autowired
private HomeMapper homeMapper;
+
+ @Autowired
private OutSliceServive outSliceServive;
+
+ @Autowired
private SpianService spianService;
public void EndTask(int types) {
if (types == 0) {// 缁堟杩涚墖浠诲姟
- List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
- for (StorageTask storageTask : cageList) {
- outSliceServive.StopTask(storageTask.getGlassId(), types);
- }
- // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
- } else {// 缁堟鍑虹墖浠诲姟
- List<StorageCage> storageCages =homeMapper.selectinout(types);
- for (StorageCage storageCage : storageCages) {
- List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
- for (StorageCage storageCagez : storageCagess) {
- if (storageCagez.getState().equals("2")) {//璋冩嫧杩涚墖
- outSliceServive.StopTask(storageCagez.getGlassId(), 0);
- }else{//鍑虹墖
- outSliceServive.StopTask(storageCagez.getGlassId(), types);
- }
+ List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
+ for (StorageTask storageTask : cageList) {
+ outSliceServive.StopTask(storageTask.getGlassId(), types);
+ }
+ // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
+ } else {// 缁堟鍑虹墖浠诲姟
+ List<StorageCage> storageCages = homeMapper.selectinout(3);
+ for (StorageCage storageCage : storageCages) {
+ List<StorageCage> storageCagess = homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
+ for (StorageCage storageCagez : storageCagess) {
+ if (storageCagez.getState().equals("2")) {// 璋冩嫧杩涚墖
+ outSliceServive.StopTask(storageCagez.getGlassId(), 0);
+ } else {// 鍑虹墖
+ outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ }
+ }
+ }
}
- }
- }
}
public void UpdateTask(Integer types, Integer shelfrack, String glassid) {
if (types == 0) {// 瀹屾垚杩涚墖
spianService.overtask(glassid);
- } else if (types == 1) {// 瀹屾垚鍑虹墖
+ } else if (types == 1) {// 瀹屾垚鍑虹墖
spianService.overtask(glassid);
- } else if (types == 2) {// 缁堟杩涚墖浠诲姟
+ } else if (types == 2) {// 缁堟杩涚墖浠诲姟
outSliceServive.StopTask(glassid, 0);
// 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
- } else {// 缁堟鍑虹墖浠诲姟
+ } else {// 缁堟鍑虹墖浠诲姟
outSliceServive.StopTask(glassid, 1);
- }
+ }
}
}
--
Gitblit v1.8.0