From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 18 一月 2025 17:06:18 +0800 Subject: [PATCH] # 6. 大屏添加作业类型 (全盘,还是分拣 IOType) 10.平库出库时,当前平库ID是写死在Sql里,需修改 11.平库出库没有判断是否预约出库,且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细,可以再次拣货,拣货明细需添加一个拣货状态 47. 确认发货前,需判断是否已绑定至集货区 48. CTU出库后,库位103不再删除原有库位信息 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java index 98eba09..0e3f61e 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java @@ -1,6 +1,7 @@ package com.zy.asrs.wms.asrs.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.asrs.entity.*; @@ -11,6 +12,7 @@ import com.zy.asrs.wms.asrs.mapper.PlatformMapper; import com.zy.asrs.wms.asrs.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,6 +20,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; @Service("platformService") public class PlatformServiceImpl extends ServiceImpl<PlatformMapper, Platform> implements PlatformService { @@ -42,6 +45,8 @@ private WaveLogService waveLogService; @Autowired private WaveDetlLogService waveDetlLogService; + @Autowired + private WaveSeedService waveSeedService; @Override @Transactional(rollbackFor = Exception.class) @@ -169,7 +174,57 @@ } @Override + @Transactional(rollbackFor = Exception.class) public R bindShippingPlatform(BindPlatformParam platform) { - return null; + if (Objects.isNull(platform.getPlatformId())) { + throw new CoolException("闆嗚揣鍖烘爣璇嗕笉鑳戒负绌猴紒锛�"); + } + if (Objects.isNull(platform.getOrderId())) { + throw new CoolException("璁㈠崟缂栫爜涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(platform.getWaveId())) { + throw new CoolException("娉㈡ID涓嶈兘涓虹┖锛侊紒"); + } + Platform pl = this.getById(platform.getPlatformId()); + if (Objects.isNull(pl)) { + throw new CoolException("闆嗚揣鍖轰笉瀛樺湪锛侊紒"); + } + List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getWaveId, platform.getWaveId()).eq(WaveSeed::getOrderId, platform.getOrderId())); + if (waveSeeds.isEmpty()) { + throw new CoolException("鍒嗘嫞鏄庣粏淇℃伅涓嶅瓨鍦紝鏁版嵁閿欒锛侊紒"); + } + ArrayList<PlatformDetl> detls = new ArrayList<>(); + waveSeeds.forEach(waveSeed -> { + PlatformDetl platformDetl = new PlatformDetl(); + BeanUtils.copyProperties(waveSeed, platformDetl); + platformDetl.setPlatformId(pl.getId()); + platformDetl.setPlatformNo(pl.getPlatformNo()); + + List<PlatformDetl> list = platformDetlService.list(new LambdaQueryWrapper<PlatformDetl>().eq(PlatformDetl::getTaskDetlId, waveSeed.getTaskDetlId()).eq(PlatformDetl::getOrderDetlId, waveSeed.getOrderDetlId()).eq(PlatformDetl::getMatnr, waveSeed.getMatnr())); + if (!list.isEmpty()) { + throw new CoolException("璁㈠崟宸插叆闆嗚揣鍖猴紒锛�"); + } + detls.add(platformDetl); + }); + + if (!platformDetlService.saveOrUpdateBatch(detls)) { + throw new CoolException("闆嗚揣鍖烘槑缁嗕繚瀛樺け璐ワ紒锛�"); + } + + List<CacheSite> list = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, platform.getOrderId())); + if (list.isEmpty()) { + throw new CoolException("璁㈠崟鏈粦瀹氭挱绉嶅簱浣嶏紝璇峰畬鎴愭嫞璐у悗锛屽啀鎵撳嵃璁㈠崟锛侊紒"); + } + + boolean update = cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>() + .eq(CacheSite::getOrderId, platform.getOrderId()) + .set(CacheSite::getPlatformId, pl.getId()) + .set(CacheSite::getPlatformNo, pl.getPlatformNo())); + + if (!update) { + throw new CoolException("鎾澧欑珯鐐圭粦瀹氶泦璐у尯澶辫触锛侊紒"); + } + + return R.ok("缁戝畾鎴愬姛锛侊紒"); } } -- Gitblit v1.9.1