From b31b4776f50e1ef0cfeeb95f5aac175a624086e4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 28 二月 2025 09:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 7048172..fbdc55e 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
@@ -8,6 +8,7 @@
import com.kangaroohy.milo.service.MiloService;
import com.mes.common.config.Const;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
@@ -102,15 +103,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())
@@ -119,7 +121,7 @@
.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";
}
@@ -212,4 +214,9 @@
//鐢熸垚涓�鏉¤鎯呮暟鎹� 浠呰褰曟灦瀛愮姸鎬�
return "success";
}
+
+ @Override
+ public List<RawGlassStorageDetailsDTO> patternUsage(String width, String height, String thickness, String films){
+ return baseMapper.patternUsage(width, height, thickness, films);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0