From 05086c2aa9d05e123a86cabedae3a4d80a3bdb32 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 19 七月 2024 16:13:54 +0800
Subject: [PATCH] 修改钢化实体类，修改指定钢化接口
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 2 +-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 4 ++--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 14 +-------------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
index 0da9c7d..120a0d1 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -104,20 +104,8 @@
private Integer state;
/**
- * 鏍煎瓙
- */
- @ApiModelProperty(value = "鏍煎瓙", position = 17)
- private Integer slot;
-
- /**
- * 閽㈠寲绫诲瀷
- */
- @ApiModelProperty(value = "閽㈠寲绫诲瀷", position = 17)
- private Integer temperingType;
-
- /**
* 宸ョ▼id
*/
@ApiModelProperty(value = "宸ョ▼id", position = 17)
- private Integer engineerId;
+ private String engineerId;
}
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 8335a7e..d83399e 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
@@ -78,8 +78,8 @@
@ApiOperation("鎸囧畾閽㈠寲")
@PostMapping("/TemperingGlass")
- public Result TemperingGlass(@RequestBody String temperingLayoutId,@RequestBody String engineerId) {
- boolean result=bigStorageCageDetailsService.TemperingGlass(temperingLayoutId,engineerId);
+ public Result TemperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ boolean result=bigStorageCageDetailsService.TemperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(),bigStorageCageDetails.getEngineerId());
if(result==true){
return Result.build(200,"鎸囧畾閽㈠寲鎴愬姛",1);
}else {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 01732e4..118e6ac 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -360,7 +360,7 @@
LambdaQueryWrapper<BigStorageCageDetails> wrapper =new LambdaQueryWrapper<>();
wrapper.eq(BigStorageCageDetails::getTemperingLayoutId,temperingLayoutId)
.eq(BigStorageCageDetails::getEngineerId,engineerId)
- .in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL,Const.GLASS_STATE_OUT_ING);
+ .in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL);
List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper);
for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
--
Gitblit v1.8.0