From dacf6715218c6061d53220b456c75a559bc5af8f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 14 三月 2025 11:30:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
index df5d53d..510c58f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -12,6 +12,8 @@
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import lombok.extern.slf4j.Slf4j;
@@ -34,6 +36,9 @@
@Autowired
RawGlassStorageTaskService rawGlassStorageTaskService;
+
+ @Autowired
+ RawGlassStorageStationService rawGlassStorageStationService;
@Autowired(required = false)
MiloService miloService;
@@ -103,15 +108,16 @@
}
@Override
- public String UpdateQuantity(RawGlassRequest request) {
+ public String updateQuantity(RawGlassRequest request) {
RawGlassStorageDetails one = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, request.getSlot())
.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
if (null == one) {
RawGlassStorageDetails details = new RawGlassStorageDetails();
BeanUtils.copyProperties(request, details);
details.setState(Const.RAW_GLASS_STATE_IN);
+ details.setShelf(request.getSlot());
save(details);
- }else{
+ } else {
update(
new LambdaUpdateWrapper<RawGlassStorageDetails>()
.set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
@@ -120,16 +126,15 @@
.set(RawGlassStorageDetails::getPatternThickness, request.getPatternThickness())
.set(RawGlassStorageDetails::getFilmsId, request.getFilmsId())
.eq(RawGlassStorageDetails::getSlot, request.getSlot())
- .eq(RawGlassStorageDetails::getSlot, Const.RAW_GLASS_STATE_IN));
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
}
return "success";
}
@Override
public String deleteWarehousing(Long slotId) {
- update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
+ remove(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
return "success";
}
@@ -218,4 +223,22 @@
public List<RawGlassStorageDetailsDTO> patternUsage(String width, String height, String thickness, String films){
return baseMapper.patternUsage(width, height, thickness, films);
}
+
+ @Override
+ public RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {
+ RawGlassStorageDetails targetDetails = new RawGlassStorageDetails();
+ RawGlassStorageStation station = rawGlassStorageStationService.getOne(new LambdaQueryWrapper<RawGlassStorageStation>()
+ .eq(RawGlassStorageStation::getSlot, targetSlot));
+ targetDetails.setDeviceId(station.getDeviceId());
+ targetDetails.setSlot(targetSlot);
+ targetDetails.setShelf(details.getShelf());
+ targetDetails.setPatternWidth(details.getPatternWidth());
+ targetDetails.setPatternHeight(details.getPatternHeight());
+ targetDetails.setPatternThickness(details.getPatternThickness());
+ targetDetails.setFilmsId(details.getFilmsId());
+ targetDetails.setRemainQuantity(details.getRemainQuantity());
+ targetDetails.setCreateTime(new Date());
+ targetDetails.setState(Const.RAW_GLASS_STATE_IN);
+ return targetDetails;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0