From 914278f6110c03250d24ed0f1f4a7d5675a228e5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 28 二月 2025 09:41:34 +0800
Subject: [PATCH] 增加破损返回数据，破损请求类增加字段
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 d370c64..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,12 +103,26 @@
}
@Override
- public String UpdateQuantity(RawGlassRequest request) {
- update(
- new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
- .eq(RawGlassStorageDetails::getSlot, request.getSlot())
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
+ 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 {
+ update(
+ new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
+ .set(RawGlassStorageDetails::getPatternWidth, request.getPatternWidth())
+ .set(RawGlassStorageDetails::getPatternHeight, request.getPatternHeight())
+ .set(RawGlassStorageDetails::getPatternThickness, request.getPatternThickness())
+ .set(RawGlassStorageDetails::getFilmsId, request.getFilmsId())
+ .eq(RawGlassStorageDetails::getSlot, request.getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
+ }
return "success";
}
@@ -177,9 +192,9 @@
.createTime(new Date()).build();
rawGlassStorageTaskService.save(task);
List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
- list.add(generateReadWriteEntity("PLC.CC.startSlot", startSlot));
- list.add(generateReadWriteEntity("PLC.CC.endSlot", endSlot));
+ list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
+ list.add(generateReadWriteEntity("CC.CC.startSlot", startSlot));
+ list.add(generateReadWriteEntity("CC.CC.endSlot", endSlot));
miloService.writeToOpcWord(list);
return Boolean.TRUE;
}
@@ -190,4 +205,18 @@
readWriteEntity.setValue(value);
return readWriteEntity;
}
+
+ @Override
+ public String shelfReset(Long slot) {
+ update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slot)
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET));
+ //鐢熸垚涓�鏉¤鎯呮暟鎹� 浠呰褰曟灦瀛愮姸鎬�
+ 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