wms-master.git - Gitblit

			@@ -1,6 +1,5 @@
			package com.vincent.rsf.server.manager.service.impl;

			import com.alibaba.fastjson.JSONArray;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.vincent.rsf.framework.common.R;
			@@ -16,13 +15,10 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import springfox.documentation.annotations.ApiIgnore;

			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 {
			@@ -53,13 +49,17 @@
			throw new CoolException("修改库位信息不能为空！！");
			}

			String join = locs.getLoc().getType();
			if (!Objects.isNull(locs.getTypeIds()) && !locs.getTypeIds().isEmpty()) {
			join = StringUtils.join(locs.getTypeIds(), ",");
			}
			boolean update = this.update(new LambdaUpdateWrapper<Loc>()
			.in(Loc::getId, locs.getId())
			.eq(Loc::getStatus, 1)
			.set(!Objects.isNull(loc.getAreaId()), Loc::getAreaId, loc.getAreaId())
			.set(!Objects.isNull(loc.getWarehouseId()), Loc::getWarehouseId, loc.getWarehouseId())
			.set(!Objects.isNull(loc.getUseStatus()), Loc::getUseStatus, loc.getUseStatus())
			.set(!Objects.isNull(loc.getType()), Loc::getType, loc.getType())
			.set(!Objects.isNull(loc.getType()), Loc::getType, join)
			.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())
			@@ -75,7 +75,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R initLocs(LocMastInitParam param) {
			public R initLocs(LocMastInitParam param, Long loginUserId) {
			//清空表
			this.baseMapper.deleteAll();

			@@ -101,6 +101,8 @@
			.setLev(l)
			.setType(join)
			.setAreaId(param.getAreaId())
			.setUpdateBy(loginUserId)
			.setCreateBy(loginUserId)
			.setWarehouseId(warehouseAreas.getWarehouseId());
			list.add(loc);
			}