From 1b602ba053af06651d5c8f50146866d98f82934c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 18 三月 2025 11:12:29 +0800 Subject: [PATCH] #修改 1.库位size字段,修改为长,宽, 高(完成 2.货架批量处理(完成 3.库位初始化功能(完成 4.筛选导出(完成 5.库位可绑定多种类型(中,高,低),可使用类型批量修改库位信息(完成 6.库位信息添加一个使用状态 (出库预约,入库预约,在库,空库,禁用, 空板)(完成 7.物料模板导出添加扩展字段 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java index dea1d43..4dd5ffe 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java @@ -1,12 +1,95 @@ package com.vincent.rsf.server.manager.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.manager.controller.params.LocMastInitParam; +import com.vincent.rsf.server.manager.controller.params.LocModifyParams; +import com.vincent.rsf.server.manager.entity.WarehouseAreas; import com.vincent.rsf.server.manager.mapper.LocMapper; import com.vincent.rsf.server.manager.entity.Loc; import com.vincent.rsf.server.manager.service.LocService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.vincent.rsf.server.manager.service.WarehouseAreasService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; @Service("locService") public class LocServiceImpl extends ServiceImpl<LocMapper, Loc> implements LocService { + @Autowired + private WarehouseAreasService warehouseAreasService; + + @Override + public R modifyLocs(LocModifyParams locs) { + if (locs.getId().isEmpty()) { + throw new CoolException("搴撲綅ID涓嶈兘涓虹┖锛侊紒"); + } + Loc loc = locs.getLoc(); + + if (Objects.isNull(loc)) { + throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒"); + } + + boolean update = this.update(new LambdaUpdateWrapper<Loc>() + .in(Loc::getId, locs.getId()) + .eq(Loc::getStatus, 1) + .set(!Objects.isNull(loc.getUseStatus()), Loc::getUseStatus, loc.getUseStatus()) + .set(!Objects.isNull(loc.getType()), Loc::getType, loc.getType()) + .set(!Objects.isNull(loc.getLength()), Loc::getLength, loc.getLength()) + .set(!Objects.isNull(loc.getWidth()), Loc::getWidth, loc.getWidth()) + .set(!Objects.isNull(loc.getHeight()), Loc::getHeight, loc.getHeight()) + .set(!Objects.isNull(loc.getChannel()), Loc::getChannel, loc.getChannel()) + .set(!Objects.isNull(loc.getFlagLabelMange()), Loc::getFlagLabelMange, loc.getFlagLabelMange()) + .set(!Objects.isNull(loc.getStatus()), Loc::getStatus, loc.getStatus())); + if (!update) { + throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒"); + } + return R.ok("鎿嶄綔鎴愬姛锛侊紒"); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public R initLocs(LocMastInitParam param) { + //娓呯┖琛� + if (this.baseMapper.delete(new LambdaUpdateWrapper<>()) < 0) { + throw new CoolException("鏁版嵁搴撳垵濮嬪寲澶辫触锛氳�佹暟鎹垹闄ゅけ璐ワ紒锛�"); + } + WarehouseAreas warehouseAreas = warehouseAreasService.getById(param.getAreaId()); + if (Objects.isNull(warehouseAreas)) { + throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�"); + } + + List<Loc> list = new ArrayList<>(); + for (int r = param.getStartRow(); r <= param.getEndRow(); r++) { + for (int b = param.getStartBay(); b <= param.getEndBay(); b++) { + for (int l = param.getStartLev(); l <= param.getEndLev(); l++) { + // 鑾峰彇搴撲綅鍙� + String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l); + Loc loc = new Loc(); + loc.setCode(locNo) + .setUseStatus("O") + .setRow(r) + .setCol(b) + .setLev(l) + .setAreaId(param.getAreaId()) + .setWarehouseId(warehouseAreas.getWareId()) + .setType(param.getType()); + + list.add(loc); + } + } + } + if (!this.saveBatch(list)) { + throw new CoolException("搴撲綅鍒濆鍖栧け璐ワ紒锛�"); + } + return R.ok("鍒濆鍖栨垚鍔燂紒锛�"); + } } -- Gitblit v1.9.1