9 changed files with 522 additions and 0 deletions
-
74src/main/java/com/gaotao/modules/autoWareHourceHaian/controller/HaiAnAreaMaintainController.java
-
35src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/HaiAnAreaData.java
-
18src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/HaiAnAreaLocationOption.java
-
18src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/HaiAnAreaWarehouseOption.java
-
65src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/vo/HaiAnArea.java
-
72src/main/java/com/gaotao/modules/autoWareHourceHaian/mapper/HaiAnAreaMaintainMapper.java
-
47src/main/java/com/gaotao/modules/autoWareHourceHaian/service/HaiAnAreaMaintainService.java
-
126src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnAreaMaintainServiceImpl.java
-
67src/main/resources/mapper/autoWareHourceHaian/HaiAnAreaMaintainMapper.xml
@ -0,0 +1,74 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.controller; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
|
import com.gaotao.common.utils.PageUtils; |
||||
|
import com.gaotao.common.utils.R; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaData; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaLocationOption; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaWarehouseOption; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.service.HaiAnAreaMaintainService; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域库位维护接口。处理haian_area的区域名称、仓库和库位,A01立库不允许修改 - rqrq |
||||
|
*/ |
||||
|
@RestController |
||||
|
@RequestMapping("/autoWareHourceHaian/haiAnAreaMaintain") |
||||
|
public class HaiAnAreaMaintainController { |
||||
|
|
||||
|
@Autowired |
||||
|
private HaiAnAreaMaintainService haiAnAreaMaintainService; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 分页查询当前大site的区域。返回含开关字段,页面只展示区域、仓库、库位和WCS区域码 - rqrq |
||||
|
*/ |
||||
|
@PostMapping("/list") |
||||
|
public R list(@RequestBody HaiAnAreaData data) { |
||||
|
// 按请求site查询区域;缺少site时服务抛错,页面不能看到其它工厂区域 - rqrq |
||||
|
IPage<HaiAnAreaData> page = haiAnAreaMaintainService.listAreas(data); |
||||
|
return R.ok().put("page", new PageUtils(page)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 查询当前大site的仓库下拉 - rqrq |
||||
|
*/ |
||||
|
@PostMapping("/warehouseOptions") |
||||
|
public R warehouseOptions(@RequestBody HaiAnAreaData data) { |
||||
|
// 仓库范围限定请求大site;失败时弹窗没有仓库可选 - rqrq |
||||
|
List<HaiAnAreaWarehouseOption> rows = haiAnAreaMaintainService.listWarehouses(data == null ? null : data.getSite()); |
||||
|
return R.ok().put("rows", rows); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 按当前大site和所选仓库查询库位下拉 - rqrq |
||||
|
*/ |
||||
|
@PostMapping("/locationOptions") |
||||
|
public R locationOptions(@RequestBody HaiAnAreaData data) { |
||||
|
// 库位同时按site和仓库过滤;仓库变化后前端会清空原库位再调用本接口 - rqrq |
||||
|
List<HaiAnAreaLocationOption> rows = haiAnAreaMaintainService.listLocations( |
||||
|
data == null ? null : data.getSite(), |
||||
|
data == null ? null : data.getWarehouseId()); |
||||
|
return R.ok().put("rows", rows); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 保存非A01区域的名称、仓库和库位。名称为空或仓库库位不存在时由服务拒绝 - rqrq |
||||
|
*/ |
||||
|
@PostMapping("/saveLocation") |
||||
|
public R saveLocation(@RequestBody HaiAnAreaData data) { |
||||
|
// 保存前核对区域名称、仓库和库位,并排除A01;失败时原区域名称和库位都不变 - rqrq |
||||
|
haiAnAreaMaintainService.saveAreaLocation(data); |
||||
|
return R.ok(); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,35 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.entity; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableField; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnArea; |
||||
|
import lombok.Data; |
||||
|
import lombok.EqualsAndHashCode; |
||||
|
import org.apache.ibatis.type.Alias; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域库位维护业务实体。继承表结构,补充分页和区域编码筛选;不落库 - rqrq |
||||
|
*/ |
||||
|
@Data |
||||
|
@EqualsAndHashCode(callSuper = true) |
||||
|
@Alias("HaiAnAreaData") |
||||
|
public class HaiAnAreaData extends HaiAnArea { |
||||
|
|
||||
|
/** |
||||
|
* 页码,前端分页传入,默认第1页。不落库 - rqrq |
||||
|
*/ |
||||
|
@TableField(exist = false) |
||||
|
private Integer page = 1; |
||||
|
|
||||
|
/** |
||||
|
* 每页条数,前端分页传入。不落库 - rqrq |
||||
|
*/ |
||||
|
@TableField(exist = false) |
||||
|
private Integer limit = 20; |
||||
|
|
||||
|
/** |
||||
|
* 区域编码筛选,对应haian_area.area_id的包含查询。为空表示当前大site全部区域。不落库 - rqrq |
||||
|
*/ |
||||
|
@TableField(exist = false) |
||||
|
private String searchAreaId; |
||||
|
} |
||||
@ -0,0 +1,18 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.entity; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
import org.apache.ibatis.type.Alias; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域维护的库位下拉项。只返回当前大site和所选仓库下的库位,不落库 - rqrq |
||||
|
*/ |
||||
|
@Data |
||||
|
@Alias("HaiAnAreaLocationOption") |
||||
|
public class HaiAnAreaLocationOption { |
||||
|
|
||||
|
/** |
||||
|
* 库位编码,来源location.LocationID,必须同时匹配请求大site和所选WareHouseID - rqrq |
||||
|
*/ |
||||
|
private String locationId; |
||||
|
} |
||||
@ -0,0 +1,18 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.entity; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
import org.apache.ibatis.type.Alias; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域维护的仓库下拉项。只返回当前大site的仓库编码,不落库 - rqrq |
||||
|
*/ |
||||
|
@Data |
||||
|
@Alias("HaiAnAreaWarehouseOption") |
||||
|
public class HaiAnAreaWarehouseOption { |
||||
|
|
||||
|
/** |
||||
|
* 仓库编码,来源warehouse.WareHouseID,且Site等于请求大site。下拉的值和显示都用它 - rqrq |
||||
|
*/ |
||||
|
private String warehouseId; |
||||
|
} |
||||
@ -0,0 +1,65 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.entity.vo; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableField; |
||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域表结构实体,字段与haian_area一一对应,供区域库位维护读取和回写 - rqrq |
||||
|
*/ |
||||
|
@Data |
||||
|
@TableName("haian_area") |
||||
|
public class HaiAnArea { |
||||
|
|
||||
|
/** |
||||
|
* 工厂,来源haian_area.site。海安区域按大site隔离,页面传入当前登录大site - rqrq |
||||
|
*/ |
||||
|
private String site; |
||||
|
|
||||
|
/** |
||||
|
* 区域编码,来源haian_area.area_id。与site组成主键;A01立库不允许在本功能改名称、仓库和库位 - rqrq |
||||
|
*/ |
||||
|
private String areaId; |
||||
|
|
||||
|
/** |
||||
|
* 区域名称,来源haian_area.area_desc,最长100。非A01保存时回写;下游下拉和按名称匹配区域会用到这个值 - rqrq |
||||
|
*/ |
||||
|
private String areaDesc; |
||||
|
|
||||
|
/** |
||||
|
* 是否允许被业务选择,来源haian_area.choose_able,Y可选、N不可选。查询带回,当前页面不展示 - rqrq |
||||
|
*/ |
||||
|
private String chooseAble; |
||||
|
|
||||
|
/** |
||||
|
* 区域对应仓库,来源haian_area.warehouse_id。非A01区域允许在本功能修改,保存前必须在当前大site的仓库表中存在 - rqrq |
||||
|
*/ |
||||
|
private String warehouseId; |
||||
|
|
||||
|
/** |
||||
|
* 区域对应库位,来源haian_area.location_id。必须属于所选仓库,保存前按大site+仓库核对location表 - rqrq |
||||
|
*/ |
||||
|
private String locationId; |
||||
|
|
||||
|
/** |
||||
|
* 是否允许移出,来源haian_area.remove_able,Y允许。查询带回,当前页面不展示 - rqrq |
||||
|
*/ |
||||
|
private String removeAble; |
||||
|
|
||||
|
/** |
||||
|
* WCS区域编码,来源haian_area.wcs_area_code。列表展示,本功能不修改 - rqrq |
||||
|
*/ |
||||
|
private String wcsAreaCode; |
||||
|
|
||||
|
/** |
||||
|
* 是否允许组盘,来源haian_area.pack_able,Y允许。查询带回,当前页面不展示 - rqrq |
||||
|
*/ |
||||
|
private String packAble; |
||||
|
|
||||
|
/** |
||||
|
* 是否缓存区,来源haian_area.cache_area_flag,Y是缓存区。查询带回,当前页面不展示 - rqrq |
||||
|
*/ |
||||
|
@TableField("cache_area_flag") |
||||
|
private String cacheAreaFlag; |
||||
|
} |
||||
@ -0,0 +1,72 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.mapper; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaData; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaLocationOption; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaWarehouseOption; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域库位维护Mapper。查询haian_area,并按大site核对仓库、库位后回写非A01区域 - rqrq |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface HaiAnAreaMaintainMapper { |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 分页查询当前大site的区域。开关字段一并查出供后续使用,页面暂不展示 - rqrq |
||||
|
* @param page 分页参数 - rqrq |
||||
|
* @param data site必填,searchAreaId可选 - rqrq |
||||
|
* @return 区域分页,失败时列表为空并中断页面查询 - rqrq |
||||
|
*/ |
||||
|
IPage<HaiAnAreaData> selectAreaList(Page<HaiAnAreaData> page, @Param("data") HaiAnAreaData data); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 查询当前大site下全部仓库编码,供编辑弹窗下拉 - rqrq |
||||
|
* @param site 登录大site - rqrq |
||||
|
* @return 仓库编码列表。查不到时下拉为空,不能保存 - rqrq |
||||
|
*/ |
||||
|
List<HaiAnAreaWarehouseOption> selectWarehouseOptions(@Param("site") String site); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 查询当前大site和指定仓库下的库位,供库位下拉 - rqrq |
||||
|
* @param site 登录大site - rqrq |
||||
|
* @param warehouseId 已选仓库 - rqrq |
||||
|
* @return 库位编码列表。仓库变更后由页面重新调用 - rqrq |
||||
|
*/ |
||||
|
List<HaiAnAreaLocationOption> selectLocationOptions(@Param("site") String site, @Param("warehouseId") String warehouseId); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 判断仓库是否属于当前大site。保存前调用,不存在则拒绝回写 - rqrq |
||||
|
* @param site 登录大site - rqrq |
||||
|
* @param warehouseId 待保存仓库 - rqrq |
||||
|
* @return 大于0表示存在 - rqrq |
||||
|
*/ |
||||
|
int countWarehouse(@Param("site") String site, @Param("warehouseId") String warehouseId); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 判断库位是否属于当前大site和所选仓库。保存前调用,避免区域指向不存在的库位 - rqrq |
||||
|
* @param site 登录大site - rqrq |
||||
|
* @param warehouseId 待保存仓库 - rqrq |
||||
|
* @param locationId 待保存库位 - rqrq |
||||
|
* @return 大于0表示存在 - rqrq |
||||
|
*/ |
||||
|
int countLocation(@Param("site") String site, @Param("warehouseId") String warehouseId, @Param("locationId") String locationId); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 只更新非A01区域的名称、仓库和库位。A01在SQL中再次排除,避免绕过服务校验 - rqrq |
||||
|
* @param data site、areaId、areaDesc、warehouseId、locationId - rqrq |
||||
|
* @return 更新行数,不是1则回滚 - rqrq |
||||
|
*/ |
||||
|
int updateAreaLocation(@Param("data") HaiAnAreaData data); |
||||
|
} |
||||
@ -0,0 +1,47 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.service; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaData; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaLocationOption; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaWarehouseOption; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域库位维护服务。查询haian_area,并只允许修改非A01区域的仓库和库位 - rqrq |
||||
|
*/ |
||||
|
public interface HaiAnAreaMaintainService { |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 分页查询当前大site的区域 - rqrq |
||||
|
* @param data site必填 - rqrq |
||||
|
* @return 区域分页 - rqrq |
||||
|
*/ |
||||
|
IPage<HaiAnAreaData> listAreas(HaiAnAreaData data); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 查询当前大site的仓库下拉 - rqrq |
||||
|
* @param site 登录大site - rqrq |
||||
|
* @return 仓库编码 - rqrq |
||||
|
*/ |
||||
|
List<HaiAnAreaWarehouseOption> listWarehouses(String site); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 查询当前大site和所选仓库下的库位 - rqrq |
||||
|
* @param site 登录大site - rqrq |
||||
|
* @param warehouseId 仓库编码 - rqrq |
||||
|
* @return 库位编码 - rqrq |
||||
|
*/ |
||||
|
List<HaiAnAreaLocationOption> listLocations(String site, String warehouseId); |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 保存非A01区域的名称、仓库和库位。名称为空、仓库或库位不存在、或区域是A01时拒绝并回滚 - rqrq |
||||
|
* @param data site、areaId、areaDesc、warehouseId、locationId - rqrq |
||||
|
*/ |
||||
|
void saveAreaLocation(HaiAnAreaData data); |
||||
|
} |
||||
@ -0,0 +1,126 @@ |
|||||
|
package com.gaotao.modules.autoWareHourceHaian.service.impl; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaData; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaLocationOption; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnAreaWarehouseOption; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.mapper.HaiAnAreaMaintainMapper; |
||||
|
import com.gaotao.modules.autoWareHourceHaian.service.HaiAnAreaMaintainService; |
||||
|
import org.apache.commons.lang.StringUtils; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
import org.springframework.transaction.annotation.Transactional; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 海安区域库位维护实现。A01立库禁止改名称和库位,其它区域保存前核对名称长度以及大site下的仓库和库位 - rqrq |
||||
|
*/ |
||||
|
@Service |
||||
|
public class HaiAnAreaMaintainServiceImpl implements HaiAnAreaMaintainService { |
||||
|
|
||||
|
private static final String STOCK_AREA_ID = "A01"; |
||||
|
|
||||
|
@Autowired |
||||
|
private HaiAnAreaMaintainMapper haiAnAreaMaintainMapper; |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 按大site分页查询区域。缺少site时拒绝,避免把其它工厂区域查出来 - rqrq |
||||
|
*/ |
||||
|
@Override |
||||
|
public IPage<HaiAnAreaData> listAreas(HaiAnAreaData data) { |
||||
|
validateSite(data); |
||||
|
int pageNo = data.getPage() == null || data.getPage() < 1 ? 1 : data.getPage(); |
||||
|
int pageSize = data.getLimit() == null || data.getLimit() < 1 ? 20 : data.getLimit(); |
||||
|
// 按大site和可选区域编码查询;失败时页面拿不到区域,不能进入改库位 - rqrq |
||||
|
return haiAnAreaMaintainMapper.selectAreaList(new Page<>(pageNo, pageSize), data); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 取当前大site的仓库编码。site为空时拒绝 - rqrq |
||||
|
*/ |
||||
|
@Override |
||||
|
public List<HaiAnAreaWarehouseOption> listWarehouses(String site) { |
||||
|
if (StringUtils.isBlank(site)) { |
||||
|
throw new RuntimeException("请求缺少site,无法查询仓库"); |
||||
|
} |
||||
|
// 只取当前大site的仓库,供弹窗下拉;查失败则不能选择仓库 - rqrq |
||||
|
return haiAnAreaMaintainMapper.selectWarehouseOptions(site.trim()); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 取当前大site和指定仓库下的库位。仓库为空时不查,避免把全部库位拉出来 - rqrq |
||||
|
*/ |
||||
|
@Override |
||||
|
public List<HaiAnAreaLocationOption> listLocations(String site, String warehouseId) { |
||||
|
if (StringUtils.isBlank(site)) { |
||||
|
throw new RuntimeException("请求缺少site,无法查询库位"); |
||||
|
} |
||||
|
if (StringUtils.isBlank(warehouseId)) { |
||||
|
throw new RuntimeException("请先选择仓库"); |
||||
|
} |
||||
|
// 库位必须同时属于大site和所选仓库;仓库一变,页面会清空原库位再重新查 - rqrq |
||||
|
return haiAnAreaMaintainMapper.selectLocationOptions(site.trim(), warehouseId.trim()); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 保存区域名称、仓库和库位。A01直接拒绝;名称为空或超长、仓库或库位不存在时不更新 - rqrq |
||||
|
*/ |
||||
|
@Override |
||||
|
@Transactional(rollbackFor = Exception.class) |
||||
|
public void saveAreaLocation(HaiAnAreaData data) { |
||||
|
validateSite(data); |
||||
|
if (StringUtils.isBlank(data.getAreaId())) { |
||||
|
throw new RuntimeException("区域编码不能为空"); |
||||
|
} |
||||
|
if (STOCK_AREA_ID.equals(data.getAreaId().trim())) { |
||||
|
throw new RuntimeException("立库A01不允许修改区域名称、仓库和库位"); |
||||
|
} |
||||
|
if (StringUtils.isBlank(data.getAreaDesc())) { |
||||
|
throw new RuntimeException("区域名称不能为空"); |
||||
|
} |
||||
|
if (data.getAreaDesc().trim().length() > 100) { |
||||
|
throw new RuntimeException("区域名称不能超过100个字符"); |
||||
|
} |
||||
|
if (StringUtils.isBlank(data.getWarehouseId()) || StringUtils.isBlank(data.getLocationId())) { |
||||
|
throw new RuntimeException("仓库和库位都不能为空"); |
||||
|
} |
||||
|
data.setSite(data.getSite().trim()); |
||||
|
data.setAreaId(data.getAreaId().trim()); |
||||
|
data.setAreaDesc(data.getAreaDesc().trim()); |
||||
|
data.setWarehouseId(data.getWarehouseId().trim()); |
||||
|
data.setLocationId(data.getLocationId().trim()); |
||||
|
|
||||
|
// 先确认仓库属于当前大site,不存在则中断,区域原库位保持不变 - rqrq |
||||
|
int warehouseCount = haiAnAreaMaintainMapper.countWarehouse(data.getSite(), data.getWarehouseId()); |
||||
|
if (warehouseCount <= 0) { |
||||
|
throw new RuntimeException("仓库" + data.getWarehouseId() + "在当前工厂不存在"); |
||||
|
} |
||||
|
// 再确认库位属于该仓库,避免只改仓库却挂上其它仓库的库位 - rqrq |
||||
|
int locationCount = haiAnAreaMaintainMapper.countLocation(data.getSite(), data.getWarehouseId(), data.getLocationId()); |
||||
|
if (locationCount <= 0) { |
||||
|
throw new RuntimeException("库位" + data.getLocationId() + "不属于仓库" + data.getWarehouseId()); |
||||
|
} |
||||
|
// 只更新这一条非A01区域;更新行数不是1说明区域不存在或被并发改掉,回滚 - rqrq |
||||
|
int updated = haiAnAreaMaintainMapper.updateAreaLocation(data); |
||||
|
if (updated != 1) { |
||||
|
throw new RuntimeException("保存失败,区域" + data.getAreaId() + "不存在或不允许修改"); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* @author rqrq |
||||
|
* @Description 区域维护必须带请求大site,不能用登录态兜底 - rqrq |
||||
|
*/ |
||||
|
private void validateSite(HaiAnAreaData data) { |
||||
|
if (data == null || StringUtils.isBlank(data.getSite())) { |
||||
|
throw new RuntimeException("请求缺少site,无法维护海安区域"); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,67 @@ |
|||||
|
<?xml version="1.0" encoding="UTF-8"?> |
||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
|
<mapper namespace="com.gaotao.modules.autoWareHourceHaian.mapper.HaiAnAreaMaintainMapper"> |
||||
|
|
||||
|
<!-- rqrq - 区域维护查询会作为改库位依据,保持加锁读,避免读到未提交的仓库库位 --> |
||||
|
<select id="selectAreaList" resultType="HaiAnAreaData"> |
||||
|
SELECT |
||||
|
site, |
||||
|
area_id AS areaId, |
||||
|
area_desc AS areaDesc, |
||||
|
choose_able AS chooseAble, |
||||
|
warehouse_id AS warehouseId, |
||||
|
location_id AS locationId, |
||||
|
remove_able AS removeAble, |
||||
|
wcs_area_code AS wcsAreaCode, |
||||
|
pack_able AS packAble, |
||||
|
cache_area_flag AS cacheAreaFlag |
||||
|
FROM haian_area |
||||
|
WHERE site = #{data.site} |
||||
|
<if test="data.searchAreaId != null and data.searchAreaId != ''"> |
||||
|
AND area_id LIKE '%' + #{data.searchAreaId} + '%' |
||||
|
</if> |
||||
|
ORDER BY area_id |
||||
|
</select> |
||||
|
|
||||
|
<select id="selectWarehouseOptions" resultType="HaiAnAreaWarehouseOption"> |
||||
|
SELECT WareHouseID AS warehouseId |
||||
|
FROM warehouse |
||||
|
WHERE Site = #{site} |
||||
|
ORDER BY WareHouseID |
||||
|
</select> |
||||
|
|
||||
|
<select id="selectLocationOptions" resultType="HaiAnAreaLocationOption"> |
||||
|
SELECT LocationID AS locationId |
||||
|
FROM location |
||||
|
WHERE Site = #{site} |
||||
|
AND WareHouseID = #{warehouseId} |
||||
|
ORDER BY LocationID |
||||
|
</select> |
||||
|
|
||||
|
<select id="countWarehouse" resultType="int"> |
||||
|
SELECT COUNT(1) |
||||
|
FROM warehouse |
||||
|
WHERE Site = #{site} |
||||
|
AND WareHouseID = #{warehouseId} |
||||
|
</select> |
||||
|
|
||||
|
<select id="countLocation" resultType="int"> |
||||
|
SELECT COUNT(1) |
||||
|
FROM location |
||||
|
WHERE Site = #{site} |
||||
|
AND WareHouseID = #{warehouseId} |
||||
|
AND LocationID = #{locationId} |
||||
|
</select> |
||||
|
|
||||
|
<!-- rqrq - 只改区域名称、仓库和库位,A01立库在条件中排除,影响行数不是1时由服务回滚 --> |
||||
|
<update id="updateAreaLocation"> |
||||
|
UPDATE haian_area |
||||
|
SET area_desc = #{data.areaDesc}, |
||||
|
warehouse_id = #{data.warehouseId}, |
||||
|
location_id = #{data.locationId} |
||||
|
WHERE site = #{data.site} |
||||
|
AND area_id = #{data.areaId} |
||||
|
AND area_id <> 'A01' |
||||
|
</update> |
||||
|
|
||||
|
</mapper> |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue