diff --git a/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java b/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java new file mode 100644 index 00000000..070f2658 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsActualWarehouseVo; +import com.klp.domain.bo.WmsActualWarehouseBo; +import com.klp.service.IWmsActualWarehouseService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 实际库区/库位自关联 + * + * @author klp + * @date 2025-11-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/actualWarehouse") +public class WmsActualWarehouseController extends BaseController { + + private final IWmsActualWarehouseService iWmsActualWarehouseService; + + /** + * 查询实际库区/库位自关联列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsActualWarehouseBo bo, PageQuery pageQuery) { + return iWmsActualWarehouseService.queryPageList(bo, pageQuery); + } + + /** + * 导出实际库区/库位自关联列表 + */ + @Log(title = "实际库区/库位自关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsActualWarehouseBo bo, HttpServletResponse response) { + List list = iWmsActualWarehouseService.queryList(bo); + ExcelUtil.exportExcel(list, "实际库区/库位自关联", WmsActualWarehouseVo.class, response); + } + + /** + * 获取实际库区/库位自关联详细信息 + * + * @param actualWarehouseId 主键 + */ + @GetMapping("/{actualWarehouseId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long actualWarehouseId) { + return R.ok(iWmsActualWarehouseService.queryById(actualWarehouseId)); + } + + /** + * 新增实际库区/库位自关联 + */ + @Log(title = "实际库区/库位自关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsActualWarehouseBo bo) { + return toAjax(iWmsActualWarehouseService.insertByBo(bo)); + } + + /** + * 修改实际库区/库位自关联 + */ + @Log(title = "实际库区/库位自关联", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsActualWarehouseBo bo) { + return toAjax(iWmsActualWarehouseService.updateByBo(bo)); + } + + /** + * 删除实际库区/库位自关联 + * + * @param actualWarehouseIds 主键串 + */ + @Log(title = "实际库区/库位自关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{actualWarehouseIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] actualWarehouseIds) { + return toAjax(iWmsActualWarehouseService.deleteWithValidByIds(Arrays.asList(actualWarehouseIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java b/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java new file mode 100644 index 00000000..0f9641c2 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java @@ -0,0 +1,61 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 实际库区/库位自关联对象 wms_actual_warehouse + * + * @author klp + * @date 2025-11-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_actual_warehouse") +public class WmsActualWarehouse extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "actual_warehouse_id") + private Long actualWarehouseId; + /** + * 父节点ID（指向同表 warehouse_id） + */ + private Long actualParentId; + /** + * 实际库区/库位编码 + */ + private String actualWarehouseCode; + /** + * 实际库区/库位名称 + */ + private String actualWarehouseName; + /** + * 类型：0=仓库，1=库区，2=库位，… + */ + private Long actualWarehouseType; + /** + * 同级排序号 + */ + private Long sortNo; + /** + * 是否启用（0=否，1=是） + */ + private Integer isEnabled; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java index fe68ad18..727dc584 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java @@ -95,5 +95,7 @@ public class WmsMaterialCoil extends BaseEntity { @TableLogic private Integer delFlag; + private Long actualWarehouseId; + } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java new file mode 100644 index 00000000..39f21e62 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java @@ -0,0 +1,61 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 实际库区/库位自关联业务对象 wms_actual_warehouse + * + * @author klp + * @date 2025-11-03 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsActualWarehouseBo extends BaseEntity { + + /** + * 主键ID + */ + private Long actualWarehouseId; + + /** + * 父节点ID（指向同表 warehouse_id） + */ + private Long actualParentId; + + /** + * 实际库区/库位编码 + */ + private String actualWarehouseCode; + + /** + * 实际库区/库位名称 + */ + private String actualWarehouseName; + + /** + * 类型：0=仓库，1=库区，2=库位，… + */ + private Long actualWarehouseType; + + /** + * 同级排序号 + */ + private Long sortNo; + + /** + * 是否启用（0=否，1=是） + */ + private Integer isEnabled; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 41aae277..36b3d7fb 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -124,5 +124,7 @@ public class WmsMaterialCoilBo extends BaseEntity { private String itemIds; + private Long actualWarehouseId; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java new file mode 100644 index 00000000..9dfd00a8 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java @@ -0,0 +1,73 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 实际库区/库位自关联视图对象 wms_actual_warehouse + * + * @author klp + * @date 2025-11-03 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsActualWarehouseVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long actualWarehouseId; + + /** + * 父节点ID（指向同表 warehouse_id） + */ + @ExcelProperty(value = "父节点ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "指=向同表,w=arehouse_id") + private Long actualParentId; + + /** + * 实际库区/库位编码 + */ + @ExcelProperty(value = "实际库区/库位编码") + private String actualWarehouseCode; + + /** + * 实际库区/库位名称 + */ + @ExcelProperty(value = "实际库区/库位名称") + private String actualWarehouseName; + + /** + * 类型：0=仓库，1=库区，2=库位，… + */ + @ExcelProperty(value = "类型：0=仓库，1=库区，2=库位，…") + private Long actualWarehouseType; + + /** + * 同级排序号 + */ + @ExcelProperty(value = "同级排序号") + private Long sortNo; + + /** + * 是否启用（0=否，1=是） + */ + @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0==否，1=是") + private Integer isEnabled; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java index 7b2b8283..4e897b65 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java @@ -182,5 +182,8 @@ public class WmsMaterialCoilVo extends BaseEntity { @ExcelProperty(value = "物品编号") private String itemCode; + private Long actualWarehouseId; + private String actualWarehouseName; + } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsActualWarehouseMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsActualWarehouseMapper.java new file mode 100644 index 00000000..2f441a9f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsActualWarehouseMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsActualWarehouse; +import com.klp.domain.vo.WmsActualWarehouseVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 实际库区/库位自关联Mapper接口 + * + * @author klp + * @date 2025-11-03 + */ +public interface WmsActualWarehouseMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java b/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java new file mode 100644 index 00000000..f36be626 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsActualWarehouse; +import com.klp.domain.vo.WmsActualWarehouseVo; +import com.klp.domain.bo.WmsActualWarehouseBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 实际库区/库位自关联Service接口 + * + * @author klp + * @date 2025-11-03 + */ +public interface IWmsActualWarehouseService { + + /** + * 查询实际库区/库位自关联 + */ + WmsActualWarehouseVo queryById(Long actualWarehouseId); + + /** + * 查询实际库区/库位自关联列表 + */ + TableDataInfo queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery); + + /** + * 查询实际库区/库位自关联列表 + */ + List queryList(WmsActualWarehouseBo bo); + + /** + * 新增实际库区/库位自关联 + */ + Boolean insertByBo(WmsActualWarehouseBo bo); + + /** + * 修改实际库区/库位自关联 + */ + Boolean updateByBo(WmsActualWarehouseBo bo); + + /** + * 校验并批量删除实际库区/库位自关联信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java new file mode 100644 index 00000000..894d99a3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java @@ -0,0 +1,114 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsActualWarehouseBo; +import com.klp.domain.vo.WmsActualWarehouseVo; +import com.klp.domain.WmsActualWarehouse; +import com.klp.mapper.WmsActualWarehouseMapper; +import com.klp.service.IWmsActualWarehouseService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 实际库区/库位自关联Service业务层处理 + * + * @author klp + * @date 2025-11-03 + */ +@RequiredArgsConstructor +@Service +public class WmsActualWarehouseServiceImpl implements IWmsActualWarehouseService { + + private final WmsActualWarehouseMapper baseMapper; + + /** + * 查询实际库区/库位自关联 + */ + @Override + public WmsActualWarehouseVo queryById(Long actualWarehouseId){ + return baseMapper.selectVoById(actualWarehouseId); + } + + /** + * 查询实际库区/库位自关联列表 + */ + @Override + public TableDataInfo queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询实际库区/库位自关联列表 + */ + @Override + public List queryList(WmsActualWarehouseBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsActualWarehouseBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getActualParentId() != null, WmsActualWarehouse::getActualParentId, bo.getActualParentId()); + lqw.eq(StringUtils.isNotBlank(bo.getActualWarehouseCode()), WmsActualWarehouse::getActualWarehouseCode, bo.getActualWarehouseCode()); + lqw.like(StringUtils.isNotBlank(bo.getActualWarehouseName()), WmsActualWarehouse::getActualWarehouseName, bo.getActualWarehouseName()); + lqw.eq(bo.getActualWarehouseType() != null, WmsActualWarehouse::getActualWarehouseType, bo.getActualWarehouseType()); + lqw.eq(bo.getSortNo() != null, WmsActualWarehouse::getSortNo, bo.getSortNo()); + lqw.eq(bo.getIsEnabled() != null, WmsActualWarehouse::getIsEnabled, bo.getIsEnabled()); + return lqw; + } + + /** + * 新增实际库区/库位自关联 + */ + @Override + public Boolean insertByBo(WmsActualWarehouseBo bo) { + WmsActualWarehouse add = BeanUtil.toBean(bo, WmsActualWarehouse.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setActualWarehouseId(add.getActualWarehouseId()); + } + return flag; + } + + /** + * 修改实际库区/库位自关联 + */ + @Override + public Boolean updateByBo(WmsActualWarehouseBo bo) { + WmsActualWarehouse update = BeanUtil.toBean(bo, WmsActualWarehouse.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsActualWarehouse entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除实际库区/库位自关联 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 8a8477b0..36b5de5e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -151,6 +151,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(bo.getWarehouseId() != null, "mc.warehouse_id", bo.getWarehouseId()); qw.eq(bo.getHasMergeSplit() != null, "mc.has_merge_split", bo.getHasMergeSplit()); qw.eq(bo.getStatus() != null, "mc.status", bo.getStatus()); + qw.eq(bo.getActualWarehouseId() != null, "mc.actual_warehouse_id", bo.getActualWarehouseId()); qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType()); // 修改itemId筛选逻辑，支持逗号分隔的多个ID查询 if (StringUtils.isNotBlank(bo.getItemIds())) { diff --git a/klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml new file mode 100644 index 00000000..fc6ef8fa --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index 7b0c31c6..a059441b 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -80,14 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.status, mc.remark, mc.warehouse_id, + mc.actual_warehouse_id, mc.del_flag, mc.create_time, mc.update_time, mc.create_by, mc.update_by, - w.warehouse_name AS warehouseName + w.warehouse_name AS warehouseName, + aw.actual_warehouse_name AS actualWarehouseName FROM wms_material_coil mc LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id + LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id ${ew.customSqlSegment} @@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"