Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

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<WmsActualWarehouseVo> 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<WmsActualWarehouseVo> list = iWmsActualWarehouseService.queryList(bo);
+        ExcelUtil.exportExcel(list, "实际库区/库位自关联", WmsActualWarehouseVo.class, response);
+    }
+
+    /**
+     * 获取实际库区/库位自关联详细信息
+     *
+     * @param actualWarehouseId 主键
+     */
+    @GetMapping("/{actualWarehouseId}")
+    public R<WmsActualWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long actualWarehouseId) {
+        return R.ok(iWmsActualWarehouseService.queryById(actualWarehouseId));
+    }
+
+    /**
+     * 新增实际库区/库位自关联
+     */
+    @Log(title = "实际库区/库位自关联", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsActualWarehouseBo bo) {
+        return toAjax(iWmsActualWarehouseService.insertByBo(bo));
+    }
+
+    /**
+     * 修改实际库区/库位自关联
+     */
+    @Log(title = "实际库区/库位自关联", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsActualWarehouseBo bo) {
+        return toAjax(iWmsActualWarehouseService.updateByBo(bo));
+    }
+
+    /**
+     * 删除实际库区/库位自关联
+     *
+     * @param actualWarehouseIds 主键串
+     */
+    @Log(title = "实际库区/库位自关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{actualWarehouseIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] actualWarehouseIds) {
+        return toAjax(iWmsActualWarehouseService.deleteWithValidByIds(Arrays.asList(actualWarehouseIds), true));
+    }
+}

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;
+
+}

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;
+
 }
 

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;
+
+
+}

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;
+
 }
 

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;
+
+
+}

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;
+
 }
 

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<WmsActualWarehouseMapper, WmsActualWarehouse, WmsActualWarehouseVo> {
+
+}

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<WmsActualWarehouseVo> queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询实际库区/库位自关联列表
+     */
+    List<WmsActualWarehouseVo> queryList(WmsActualWarehouseBo bo);
+
+    /**
+     * 新增实际库区/库位自关联
+     */
+    Boolean insertByBo(WmsActualWarehouseBo bo);
+
+    /**
+     * 修改实际库区/库位自关联
+     */
+    Boolean updateByBo(WmsActualWarehouseBo bo);
+
+    /**
+     * 校验并批量删除实际库区/库位自关联信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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<WmsActualWarehouseVo> queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WmsActualWarehouse> lqw = buildQueryWrapper(bo);
+        Page<WmsActualWarehouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询实际库区/库位自关联列表
+     */
+    @Override
+    public List<WmsActualWarehouseVo> queryList(WmsActualWarehouseBo bo) {
+        LambdaQueryWrapper<WmsActualWarehouse> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<WmsActualWarehouse> buildQueryWrapper(WmsActualWarehouseBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<WmsActualWarehouse> 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<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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())) {

klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml

@@ -0,0 +1,24 @@
+<?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.klp.mapper.WmsActualWarehouseMapper">
+
+    <resultMap type="com.klp.domain.WmsActualWarehouse" id="WmsActualWarehouseResult">
+        <result property="actualWarehouseId" column="actual_warehouse_id"/>
+        <result property="actualParentId" column="actual_parent_id"/>
+        <result property="actualWarehouseCode" column="actual_warehouse_code"/>
+        <result property="actualWarehouseName" column="actual_warehouse_name"/>
+        <result property="actualWarehouseType" column="actual_warehouse_type"/>
+        <result property="sortNo" column="sort_no"/>
+        <result property="isEnabled" column="is_enabled"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+
+</mapper>

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}
     </select>
     <!-- 查询不同类型的钢卷在不同库区的分布情况 -->
@@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectVoListWithDynamicJoin" resultType="com.klp.domain.vo.WmsMaterialCoilVo">
         SELECT mc.*,
                w.warehouse_name AS warehouseName,
+               aw.warehouse_name AS actualWarehouseName,
                CASE
                    WHEN mc.item_type = 'row_material' THEN rm.raw_material_name
                    WHEN mc.item_type = 'product' THEN p.product_name
@@ -131,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN wms_raw_material rm ON mc.item_type = 'row_material' AND mc.item_id = rm.raw_material_id
                  LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
             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}
     </select>