wms-master.git - Gitblit

			@@ -1,8 +1,6 @@
			package com.vincent.rsf.server.manager.controller;

			import com.alibaba.fastjson.JSONArray;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.vincent.rsf.framework.common.Cools;
			import com.vincent.rsf.framework.common.R;
			@@ -15,11 +13,11 @@
			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.Loc;
			import com.vincent.rsf.server.manager.enums.CommonStatus;
			import com.vincent.rsf.server.manager.enums.LocStsType;
			import com.vincent.rsf.server.manager.service.LocService;
			import com.vincent.rsf.server.system.controller.BaseController;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiModelProperty;
			import io.swagger.annotations.ApiOperation;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -29,7 +27,6 @@

			import javax.servlet.http.HttpServletResponse;
			import javax.validation.Valid;
			import javax.validation.constraints.NotNull;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -134,6 +131,10 @@
			loc.setTypeIds(Arrays.asList(Long.valueOf(loc.getType())));
			}

			if (loc.getStatus().equals(CommonStatus.COMMONSTATUS_NO.val)) {
			loc.setUseStatus(LocStsType.LOC_STS_TYPE_X.type);
			}

			if (!locService.updateById(loc)) {
			return R.error("Update Fail");
			}
			@@ -212,9 +213,6 @@
			}
			if (Objects.isNull(param.getTypeIds()) && param.getTypeIds().isEmpty()) {
			return R.error("库位类型不能为空！！");
			}
			if (Objects.isNull(param.getWarehouseId())) {
			return R.error("仓库ID不能为空！！");
			}
			if (Objects.isNull(param.getAreaId())) {
			return R.error("库区ID不能为空！！");