From c823892f961b266199731ddd365d2dd4af4bf382 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 08:50:27 +0800
Subject: [PATCH] 1、中空线初步版本，待优化 2、fixbug 钢化后摆片顺序错乱

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java |   63 ++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 7bf0afc..b069d57 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,8 +1,13 @@
 package com.mes.bigstorage.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.mes.bigstorage.entity.BigStorageCageDetails;
 import com.mes.bigstorage.service.BigStorageCageDetailsService;
 import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.common.config.Const;
+import com.mes.utils.RedisUtil;
 import com.mes.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +17,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +38,8 @@
     private BigStorageCageDetailsService bigStorageCageDetailsService;
     @Autowired
     private BigStorageCageService bigStorageCageService;
+    @Resource
+    private RedisUtil redisUtil;
 
 
     @ApiOperation("鐜荤拑璇︽儏鏌ヨ")
@@ -83,7 +91,8 @@
     @ApiOperation("鎸囧畾閽㈠寲")
     @PostMapping("/TemperingGlass")
     public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
-        boolean result = bigStorageCageDetailsService.temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId());
+        boolean result = bigStorageCageDetailsService
+                .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(),bigStorageCageDetails.getTemperingFeedSequence().toString());
         if (result == true) {
             return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
         } else {
@@ -97,10 +106,60 @@
         return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass());
     }
 
+    @ApiOperation("鏄惁璋冨害寮�鍏�")
+    @PostMapping("/dispatchSwitch")
+    public Result dispatchSwitch(Boolean flag) {
+        bigStorageCageDetailsService.dispatchSwitch(flag);
+        return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("dispatchSwitch"));
+    }
+
     @ApiOperation("鏄惁閽㈠寲寮�鍏�")
     @PostMapping("/temperingSwitch")
     public Result temperingSwitch(Boolean flag) {
-        return Result.build(200, "淇敼鎴愬姛", bigStorageCageDetailsService.temperingSwitch(flag));
+        bigStorageCageDetailsService.temperingSwitch(flag);
+        return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("temperingSwitch"));
     }
+
+    @ApiOperation("娴佺▼鍗℃煡璇�")
+    @PostMapping("/selectFlowCardByCache")
+    public Result selectFlowCardByCache() {
+        List<Map<String, Object>> flowCardIdCount=bigStorageCageDetailsService.listMaps(
+                new QueryWrapper<BigStorageCageDetails>()
+                        .select("flow_card_id,layer,count(*) as count")
+                        .eq("state", Const.GLASS_STATE_IN)
+                        .eq("tempering_layout_id",0)
+                        .groupBy("flow_card_id,layer")
+        );
+        return Result.build(200, "鏌ヨ鎴愬姛", flowCardIdCount);
+    }
+
+    @ApiOperation("鎸囧畾娴佺▼鍗�")
+    @PostMapping("/appointFlowCard")
+    public Result appointFlowCard(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+        List<BigStorageCageDetails> bigStorageCageDetailsList=bigStorageCageDetailsService.list(
+                new LambdaQueryWrapper<BigStorageCageDetails>()
+                .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL)
+        );
+        if(bigStorageCageDetailsList.size()==0){
+            bigStorageCageDetailsService.update(
+                    new LambdaUpdateWrapper<BigStorageCageDetails>()
+                            .set(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL)
+                            .eq(BigStorageCageDetails::getFlowCardId,bigStorageCageDetails.getFlowCardId())
+                            .eq(BigStorageCageDetails::getLayer,bigStorageCageDetails.getLayer())
+                            .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN)
+            );
+            return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
+        }else{
+            return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
+        }
+    }
+
+    @ApiOperation("鎸囧畾宸ョ▼")
+    @PostMapping("/appointEngineerId")
+    public Result appointEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+        bigStorageCageDetailsService.appointEngineerId(bigStorageCageDetails.getEngineerId());
+        return Result.build(200, "淇敼鎴愬姛", 1);
+    }
+
 }
 

--
Gitblit v1.8.0