From 0aacd330fca570ab3350aef5bda901f23aee23b3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 ee43453..bd2e2de 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,13 +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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.common.utils.RedisUtil;
+import com.mes.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -91,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 {
@@ -125,6 +126,33 @@
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