From 0533bba71d330019c5c61bee1e10f78ea2abdbcf Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 17 十二月 2024 09:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 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 280a6bf..5ff1a1b 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
@@ -4,9 +4,13 @@
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.entity.dto.GlassInfoLackDTO;
+import com.mes.bigstorage.entity.dto.TemperingGlassCountDTO;
+import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.common.config.Const;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
@@ -45,11 +49,11 @@
@ApiOperation("鐜荤拑璇︽儏鏌ヨ")
@PostMapping("/selectBigStorageCageDetails")
public Result selectBigStorageCageDetails(@RequestBody Map map) {
- List<BigStorageCageDetails> bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString());
- if (bigStorageCageDetails.size()>0){
- return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails);
- }else{
- return Result.build(200,"鏌ヨ澶辫触锛屾棤姝ょ幓鐠僫d",bigStorageCageDetails);
+ List<BigStorageCageDetails> bigStorageCageDetails = bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString());
+ if (bigStorageCageDetails.size() > 0) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetails);
+ } else {
+ return Result.build(200, "鏌ヨ澶辫触锛屾棤姝ょ幓鐠僫d", bigStorageCageDetails);
}
}
@@ -57,42 +61,42 @@
@PostMapping("/insertBigStorageCageDetails")
public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
+ return Result.build(200, "娣诲姞鎴愬姛", bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
@PostMapping("/deleteBigStorageCageDetails")
public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
+ return Result.build(200, "鍒犻櫎鎴愬姛", bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
@PostMapping("/damageBigStorageCageDetails")
- public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails,int status) {
- bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(),status);
- return Result.build(200,"鐮存崯/鎷胯蛋鎴愬姛",1);
+ public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails, int status) {
+ bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(), status);
+ return Result.build(200, "鐮存崯/鎷胯蛋鎴愬姛", 1);
}
@ApiOperation("鐞嗙墖绗间换鍔″畬鎴�")
@PostMapping("/finishBigStorageCageDetails")
public Result finishBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.finishBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"浠诲姟瀹屾垚鎴愬姛",1);
+ return Result.build(200, "浠诲姟瀹屾垚鎴愬姛", 1);
}
@ApiOperation("鐞嗙墖绗间换鍔″嚭鐗�")
@PostMapping("/outBigStorageCageDetails")
public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"鍑虹墖娣诲姞鎴愬姛",1);
+ return Result.build(200, "鍑虹墖娣诲姞鎴愬姛", 1);
}
@ApiOperation("鎸囧畾閽㈠寲")
@PostMapping("/TemperingGlass")
public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
boolean result = bigStorageCageDetailsService
- .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(),bigStorageCageDetails.getTemperingFeedSequence().toString());
+ .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(), bigStorageCageDetails.getTemperingFeedSequence().toString());
if (result == true) {
return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
} else {
@@ -100,10 +104,16 @@
}
}
- @ApiOperation("閽㈠寲鏌ヨ")
+ @ApiOperation("閽㈠寲/闈為挗鍖栨煡璇細0 闈為挗鍖� 1锛氶挗鍖�")
@PostMapping("/selectTemperingGlass")
- public Result selectTemperingGlass() {
- return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass());
+ public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass(isTempering));
+ }
+
+ @ApiOperation("缂虹墖鏁伴噺鏌ヨ")
+ @PostMapping("/queryLackGlassInfo")
+ public Result<List<GlassInfoLackDTO>> queryLackGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.queryLackGlassInfo(bigStorageQueryVO));
}
@ApiOperation("鏄惁璋冨害寮�鍏�")
@@ -123,11 +133,11 @@
@ApiOperation("娴佺▼鍗℃煡璇�")
@PostMapping("/selectFlowCardByCache")
public Result selectFlowCardByCache() {
- List<Map<String, Object>> flowCardIdCount=bigStorageCageDetailsService.listMaps(
+ 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)
+ .eq("tempering_layout_id", 0)
.groupBy("flow_card_id,layer")
);
return Result.build(200, "鏌ヨ鎴愬姛", flowCardIdCount);
@@ -136,20 +146,20 @@
@ApiOperation("鎸囧畾娴佺▼鍗�")
@PostMapping("/appointFlowCard")
public Result appointFlowCard(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
- List<BigStorageCageDetails> bigStorageCageDetailsList=bigStorageCageDetailsService.list(
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL)
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
);
- if(bigStorageCageDetailsList.size()==0){
+ 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)
+ .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{
+ } else {
return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
}
}
--
Gitblit v1.8.0