From ef47083c90ff7e70362a32741a0a4d5770037e7f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 三月 2024 10:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 109 insertions(+), 0 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 5e8ccf9..c8d5699 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
@@ -1,5 +1,6 @@
package com.example.springboot.service;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -11,6 +12,8 @@
import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
+import com.example.springboot.entity.FlowCard;
+import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
@@ -206,4 +209,110 @@
return homeMapper.SelectStorageCageInfo();
}
+ // 澧炲姞/鍑忓皯鐞嗙墖绗肩幓鐠冩暟
+ public Result UpdateStroageCageByCell(Integer cell, Integer num) {
+ if (num == 0) {
+ homeMapper.DeleteStroageCageByCell(cell);
+ } else {
+ homeMapper.updateStroageCageByCell(cell, num);
+ homeMapper.UpdateStroageCageWidthByCell(cell);
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鏌ヨ杩�/鍑虹墖浠诲姟
+ public List<StorageTask> SelectStorageTask(int task_type) {
+ List<StorageTask> storageTasks = new ArrayList<>();
+ if (task_type == 0) {
+ storageTasks = homeMapper.SelectStorageTask(task_type);
+ } else {
+ storageTasks = homeMapper.SelectStorageTask(task_type);
+ }
+ for (StorageTask storageTask : storageTasks) {
+ storageTask.setstorageCage(homeMapper.SelectStorageByCell(storageTask.getLoadrack()));
+ }
+ return storageTasks;
+ }
+
+ //鎵嬪姩瀹屾垚浠诲姟
+ public Result FinishTask(Integer tasktype, Integer id) {
+ StorageTask storageTask = homeMapper.SelectStorageTaskById(id);//鑾峰彇浠诲姟淇℃伅
+ homeMapper.FinishTask(storageTask.getId());//瀹屾垚浠诲姟
+ if(storageTask.getTaskType().equals("0")){
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getLoadrack()),1);//鐜荤拑鏁伴噺+1
+ }else{
+ StorageCage storageCage = homeMapper.SelectStorageByCell(storageTask.getShelfRack());
+ if(storageCage.getNumber()>1){
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()),-1);//鐜荤拑鏁伴噺-1
+ }else{
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()),0);//娓呴櫎鏍煎唴淇℃伅
+ }
+ homeMapper.AddGlassNo(storageTask.getFlowcard(),storageTask.getMateid(),storageTask.geTier());//娣诲姞鍑虹墖瀹屾垚鏁伴噺
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+
+ //鏌ヨ鐜荤拑淇℃伅
+ public Result SelectGlassInfo(String width,String height,String thickness,String films) {
+ List<GlassInfo> glassInfoList = homeMapper.SelectGlassInfo(width,height,thickness,films);
+ Map<String, Object> map = new HashMap<>();
+ map.put("StorageCageAddInfo", glassInfoList);
+ return Result.success(map);
+ }
+
+ //娣诲姞鐜荤拑鍒版牸瀛愬唴
+ public Result StorageCageAddGlass(String cell,GlassInfo glassInfo) {
+ homeMapper.StorageCageAddGlass(cell,glassInfo);
+ UpdateStroageCageByCell(Integer.parseInt(cell),1);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ //鏌ヨ璁㈠崟浠诲姟
+ public List<FlowCard> SelectOrderTask() {
+ List<FlowCard> OrderTask=homeMapper.SelectOrderTask();
+ for (FlowCard flowcard : OrderTask) {
+ flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
+ }
+ return OrderTask;
+ }
+
+ //寮�濮嬩换鍔�
+ public Result ClaimTasks(String flowcard, Integer state) {
+ if(state==1){
+ homeMapper.ClaimTasks(flowcard,0);
+ }else{
+ homeMapper.ClaimTasks(flowcard,1);
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ //浠诲姟妯″紡淇敼
+ public Result ModeChange(String flowcard, Integer method) {
+ if(method==1){
+ homeMapper.ModeChange(flowcard,0);
+ }else{
+ homeMapper.ModeChange(flowcard,1);
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ //淇敼娴嬮噺淇℃伅
+ public Result UpdateQueue(GlassInfo glassInfo) {
+ homeMapper.UpdateQueue(glassInfo.getFlowcard(),glassInfo.getWidth(),glassInfo.getHeight(),glassInfo.getGlasstype());
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
}
--
Gitblit v1.8.0