From 119baa8e4d47b8af6117dd0bbe35fd1755504ee1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 十二月 2024 22:20:03 +0800
Subject: [PATCH] 1、卧理不同界面报破损功能优化 2、大理片笼新增按照钢化版图查询笼内玻璃信息
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 87ce02b..e2a9e9d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -13,7 +13,7 @@
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
-import com.mes.edgglasstask.entity.request.IdentWornRequest;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
@@ -33,7 +33,6 @@
import com.mes.taskcache.service.TaskCacheService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,9 +69,6 @@
@Autowired
TaskCacheService taskCacheService;
-
- @Resource
- DamageMapper damageMapper;
@Autowired
DamageService damageService;
@@ -291,27 +287,19 @@
return outEdgStorageCageDetails;
}
+
@Override
- public String identControls(IdentWornRequest request) {
+ public String identControls(DamageRequest request) {
//灏嗚瘑鍒牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
- Damage damage = new Damage();
- BeanUtils.copyProperties(request, damage);
- damage.setType(request.getState());
- damage.setRemark("");
- damage.setStatus(0);
- damageService.insertDamage(damage);
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "鎺扮墖璇嗗埆", request.getState());
return "success";
}
@Override
- public String edgReportStatus(IdentWornRequest request) {
+ public String edgReportStatus(DamageRequest request) {
//灏嗙（杈归槦鍒楃牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
- Damage damage = new Damage();
- BeanUtils.copyProperties(request, damage);
- damage.setType(request.getState());
- damage.setRemark("");
- damage.setStatus(0);
- damageService.insertDamage(damage);
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "纾ㄨ竟娓呮礂", request.getState());
+
//淇敼纾ㄨ竟闃熷垪鏁版嵁鐘舵��
edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
.set(EdgGlassTaskInfo::getState, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
@@ -333,7 +321,7 @@
//璇存槑姝ょ幓鐠冩病鏈夎繘杩囩悊鐗�
return true;
} else {
- List<Damage> damage = damageMapper.selectList(new LambdaQueryWrapper<Damage>()
+ List<Damage> damage = damageService.list(new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
.and(wrapper -> wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
);
@@ -348,4 +336,12 @@
public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height) {
return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height);
}
+
+ @Override
+ public String edgDetailsOperate(DamageRequest request) {
+ //鍗у紡鐞嗙墖绗肩垎鐮存崯
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "鍗у紡鐞嗙墖绗�", request.getState());
+ this.remove(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId,request.getGlassId()));
+ return "success";
+ }
}
--
Gitblit v1.8.0