From 5c2e8a80d739c5659d74bfd2cbe232b5d72ce21f Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期二, 15 十月 2024 16:47:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 48 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java index a71cc7f..e608d50 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java @@ -1,7 +1,7 @@ package com.mes.rawglassdetails.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.common.config.Const; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; @@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -21,16 +22,6 @@ @Service @Slf4j public class RawGlassStorageDetailsServiceImpl extends ServiceImpl<RawGlassStorageDetailsMapper, RawGlassStorageDetails> implements RawGlassStorageDetailsService { - - @Override - public boolean updateRawGlassStorageDetails(String films_id) { - UpdateWrapper<RawGlassStorageDetails> wrapper = new UpdateWrapper<>(); //杩欎釜绫诲瀷瀹氫箟閿欎簡锛屼笉搴旇鏄痶asking - wrapper.set("films_id", "1005") - .eq("films_id", films_id); - - return update(wrapper);//杩欎釜鏂规硶榛樿杩斿洖鐨勫氨鏄痓ool绫诲瀷 鎵�鏈夊彲浠ョ洿鎺eturn杩欎釜鏂规硶锛宱k浜嗭紝浣犳甯稿垱寤烘柟娉曞幓涓婁竴灞傚垱 - } - @Override public boolean deleteRawGlassStorageDetails(String device_id) { QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>(); @@ -47,10 +38,6 @@ return list(); } - @Override - public boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw) { - return this.save(rw); - } @Override public String patternWarehousing(RawGlassRequest request) { @@ -58,8 +45,37 @@ RawGlassStorageDetails details = new RawGlassStorageDetails(); BeanUtils.copyProperties(request, details); details.setState(Const.GLASS_STATE_IN); + details.setCreateTime(new Date()); save(details); - return null; + return "success"; + } + + @Override + public String UpdateQuantity(RawGlassRequest request) { + update( + new LambdaUpdateWrapper<RawGlassStorageDetails>() + .set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity()) + .eq(RawGlassStorageDetails::getSlotId, request.getSlotId())); + return "success"; + } + + @Override + public String deleteWarehousing(Long slotId) { + update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlotId, slotId) + .set(RawGlassStorageDetails::getState, Const.GLASS_STATE_OUT)); + return "success"; + } + + @Override + public String outWarehousing(Long slotId) { + update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlotId, slotId) + .set(RawGlassStorageDetails::getState, Const.GLASS_STATE_OUT_ING)); + return "success"; + } + + @Override + public List<Integer> listBySlotState(List<String> liftingStation, List<Integer> state) { + return baseMapper.listBySlotState(liftingStation, state); } } \ No newline at end of file -- Gitblit v1.8.0