cuilei
2025-05-12 d2e761122e4c1c1c027f20eb0cf6455b1f45bea6
工具管理-货架标签信息管理
已添加7个文件
已修改10个文件
491 ■■■■■ 文件已修改
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesMarkController.java 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelvesMark.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/DictVo.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/GoodsShelvesMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/GoodsShelvesMarkMapper.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/WarehouseMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMarkMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IGoodsShelvesMarkService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IGoodsShelvesService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IWarehouseService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/GoodsShelvesMarkServiceImpl.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/GoodsShelvesServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesController.java
@@ -13,6 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.GoodsShelves;
import org.jeecg.modules.tms.entity.vo.DictVo;
import org.jeecg.modules.tms.service.IGoodsShelvesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -71,6 +72,22 @@
        IPage<GoodsShelves> pageList = goodsShelvesService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }
    @ApiOperation(value="tms_goods_shelves-通过仓库id查询货架字典数据", notes="tms_goods_shelves-通过仓库id查询货架字典数据")
    @GetMapping(value = "queryGoodsShelvesDictList")
    public Result<List<DictVo>> queryGoodsShelvesDictList(@RequestParam("warehouseId") String warehouseId) {
        List<DictVo> list = goodsShelvesService.queryGoodsShelvesDictList(warehouseId);
        return Result.OK(list);
    }
    @ApiOperation(value="tms_goods_shelves-通过仓库id、货架编号查询货架层数字典数据", notes="tms_goods_shelves-通过仓库id、货架编号查询货架层数字典数据")
    @GetMapping(value = "queryGoodsShelvesStoreyDictList")
    public Result<List<DictVo>> queryGoodsShelvesStoreyDictList(@RequestParam("warehouseId") String warehouseId,
                                                                @RequestParam("shelfNumber") String shelfNumber) {
        List<DictVo> list = goodsShelvesService.queryGoodsShelvesStoreyDictList(warehouseId, shelfNumber);
        return Result.OK(list);
    }
    
    /**
     *   æ·»åŠ 
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesMarkController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,191 @@
package org.jeecg.modules.tms.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.GoodsShelvesMark;
import org.jeecg.modules.tms.service.IGoodsShelvesMarkService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
 /**
 * @Description: tms_goods_shelves_mark
 * @Author: jeecg-boot
 * @Date:   2025-05-09
 * @Version: V1.0
 */
@Api(tags="tms_goods_shelves_mark")
@RestController
@RequestMapping("/tms/goodsShelvesMark")
@Slf4j
public class GoodsShelvesMarkController extends JeecgController<GoodsShelvesMark, IGoodsShelvesMarkService> {
    @Autowired
    private IGoodsShelvesMarkService goodsShelvesMarkService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param goodsShelvesMark
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "tms_goods_shelves_mark-分页列表查询")
    @ApiOperation(value="tms_goods_shelves_mark-分页列表查询", notes="tms_goods_shelves_mark-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<GoodsShelvesMark>> queryPageList(GoodsShelvesMark goodsShelvesMark,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        Map<String, String[]> parameterMap = req.getParameterMap();
        Page<GoodsShelvesMark> page = new Page<GoodsShelvesMark>(pageNo, pageSize);
        IPage<GoodsShelvesMark> pageList = goodsShelvesMarkService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }
    /**
     *   æ·»åŠ 
     *
     * @param goodsShelvesMark
     * @return
     */
    @AutoLog(value = "tms_goods_shelves_mark-添加")
    @ApiOperation(value="tms_goods_shelves_mark-添加", notes="tms_goods_shelves_mark-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves_mark:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody GoodsShelvesMark goodsShelvesMark) {
        goodsShelvesMarkService.save(goodsShelvesMark);
        return Result.OK("添加成功!");
    }
    /**
     *  ç¼–辑
     *
     * @param goodsShelvesMark
     * @return
     */
    @AutoLog(value = "tms_goods_shelves_mark-编辑")
    @ApiOperation(value="tms_goods_shelves_mark-编辑", notes="tms_goods_shelves_mark-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves_mark:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody GoodsShelvesMark goodsShelvesMark) {
        goodsShelvesMarkService.updateById(goodsShelvesMark);
        return Result.OK("编辑成功!");
    }
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "tms_goods_shelves_mark-通过id删除")
    @ApiOperation(value="tms_goods_shelves_mark-通过id删除", notes="tms_goods_shelves_mark-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves_mark:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        goodsShelvesMarkService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "tms_goods_shelves_mark-批量删除")
    @ApiOperation(value="tms_goods_shelves_mark-批量删除", notes="tms_goods_shelves_mark-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves_mark:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.goodsShelvesMarkService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "tms_goods_shelves_mark-通过id查询")
    @ApiOperation(value="tms_goods_shelves_mark-通过id查询", notes="tms_goods_shelves_mark-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<GoodsShelvesMark> queryById(@RequestParam(name="id",required=true) String id) {
        GoodsShelvesMark goodsShelvesMark = goodsShelvesMarkService.getById(id);
        if(goodsShelvesMark==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(goodsShelvesMark);
    }
    @ApiOperation(value="tms_goods_shelves_mark-数据重复值校验查询", notes="tms_goods_shelves_mark-数据重复值校验查询")
    @GetMapping(value = "/duplicateCheckSelect")
    public Result<List<GoodsShelvesMark>> duplicateCheckSelect(@RequestParam("warehouseId") String warehouseId,
                                                               @RequestParam("goodsShelves") String goodsShelves,
                                                               @RequestParam("storey") String storey) {
        List<GoodsShelvesMark> list = goodsShelvesMarkService.list(new LambdaQueryWrapper<GoodsShelvesMark>()
                .eq(GoodsShelvesMark::getWarehouseId, warehouseId)
                .eq(GoodsShelvesMark::getGoodsShelves, goodsShelves)
                .eq(GoodsShelvesMark::getStorey, storey));
        return Result.OK(list);
    }
    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param goodsShelvesMark
    */
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves_mark:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, GoodsShelvesMark goodsShelvesMark) {
        return super.exportXls(request, goodsShelvesMark, GoodsShelvesMark.class, "tms_goods_shelves_mark");
    }
    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("tms_goods_shelves_mark:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, GoodsShelvesMark.class);
    }
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java
@@ -15,6 +15,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.Warehouse;
import org.jeecg.modules.tms.entity.vo.DictVo;
import org.jeecg.modules.tms.service.IWarehouseService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -74,6 +75,13 @@
        return Result.OK(pageList);
    }
    @ApiOperation(value="tms_warehouse-加载字典数据", notes="tms_warehouse-加载字典数据")
    @GetMapping(value = "/queryWarehouseDictList")
    public Result<List<DictVo>> queryWarehouseDictList() {
        List<DictVo> dictVoList = warehouseService.queryWarehouseDictList();
        return Result.OK(dictVoList);
    }
    @ApiOperation(value="tms_warehouse-加载树形结构数据", notes="tms_warehouse-加载树形结构数据")
    @GetMapping(value = "/loadTree")
    public Result<?> loadTree() {
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelvesMark.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package org.jeecg.modules.tms.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
 * @Description: tms_goods_shelves_mark
 * @Author: jeecg-boot
 * @Date:   2025-05-09
 * @Version: V1.0
 */
@Data
@TableName("tms_goods_shelves_mark")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tms_goods_shelves_mark对象", description="tms_goods_shelves_mark")
public class GoodsShelvesMark implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**仓库编号*/
    @Excel(name = "仓库编号", width = 15)
    @ApiModelProperty(value = "仓库编号")
    private String warehouseId;
    /**仓库编号*/
    @TableField(exist = false)
    private String warehouseNum;
    /**仓库名称*/
    @TableField(exist = false)
    private String warehouseName;
    /**货架编号*/
    @Excel(name = "货架编号", width = 15)
    @ApiModelProperty(value = "货架编号")
    private String goodsShelves;
    /**货架名称*/
    @TableField(exist = false)
    private String shelfName;
    /**层数信息*/
    @Excel(name = "层数信息", width = 15)
    @ApiModelProperty(value = "层数信息")
    private String storey;
    /**品种-标注存放刀具品种信息*/
    @Excel(name = "品种-标注存放刀具品种信息", width = 15)
    @ApiModelProperty(value = "品种-标注存放刀具品种信息")
    private String variety;
    /**租户号*/
    @Excel(name = "租户号", width = 15)
    @ApiModelProperty(value = "租户号")
    private String tenantId;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/DictVo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package org.jeecg.modules.tms.entity.vo;
import lombok.Data;
/***
 * ä¸‹æ‹‰æ¡†å­—典查询封装对象
 */
@Data
public class DictVo {
    private String value;
    private String label;
    private String title;
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/GoodsShelvesMapper.java
@@ -7,6 +7,9 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.GoodsShelves;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.tms.entity.vo.DictVo;
import java.util.List;
/**
 * @Description: tms_goods_shelves
@@ -18,4 +21,9 @@
    IPage<GoodsShelves> queryPageList(Page<GoodsShelves> page,
                                      @Param(Constants.WRAPPER) Wrapper<GoodsShelves> queryWrapper);
    List<DictVo> queryGoodsShelvesDictList(@Param("warehouseId") String warehouseId);
    List<DictVo> queryGoodsShelvesStoreyDictList(@Param("warehouseId") String warehouseId,
                                                 @Param("shelfNumber") String shelfNumber);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/GoodsShelvesMarkMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package org.jeecg.modules.tms.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.GoodsShelvesMark;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * @Description: tms_goods_shelves_mark
 * @Author: jeecg-boot
 * @Date:   2025-05-09
 * @Version: V1.0
 */
public interface GoodsShelvesMarkMapper extends BaseMapper<GoodsShelvesMark> {
    IPage<GoodsShelvesMark> queryPageList(Page<GoodsShelvesMark> page,
                                          @Param(Constants.WRAPPER) Wrapper<GoodsShelvesMark> queryWrapper);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/WarehouseMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.Warehouse;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.tms.entity.vo.DictVo;
/**
 * @Description: tms_warehouse
@@ -21,4 +22,6 @@
    IPage<Warehouse> queryPageList(Page<Warehouse> page,
                                   @Param(Constants.WRAPPER) Wrapper<Warehouse> queryWrapper);
    List<DictVo> queryWarehouseDictList();
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml
@@ -22,4 +22,20 @@
        LEFT JOIN tms_warehouse p on t.warehouse_id = p.id
        ${ew.customSqlSegment}
    </select>
    <select id="queryGoodsShelvesDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
        SELECT DISTINCT
            shelf_number value,
            ISNULL(shelf_number, '') + '/' + ISNULL(shelf_name, '') label,
            ISNULL(shelf_number, '') + '/' + ISNULL(shelf_name, '') title
        FROM tms_goods_shelves
        where warehouse_id = #{warehouseId}
    </select>
    <select id="queryGoodsShelvesStoreyDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
        SELECT DISTINCT
            storey value,
            storey label,
            storey title
        FROM tms_goods_shelves
        WHERE warehouse_id = #{warehouseId} AND shelf_number = #{shelfNumber}
    </select>
</mapper>
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMarkMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
<?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="org.jeecg.modules.tms.mapper.GoodsShelvesMarkMapper">
    <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.GoodsShelvesMark">
        SELECT
            t.id,
            t.warehouse_id warehouseId,
            p.warehouse_id warehouseNum,
            p.warehouse_name warehouseName,
            t.goods_shelves goodsShelves,
            q.shelf_name shelfName,
            t.storey,
            t.variety,
            t.tenant_id tenantId,
            t.create_by createBy,
            t.create_time createTime,
            t.update_by updateBy,
            t.update_time updateTime
        FROM tms_goods_shelves_mark t
        LEFT JOIN tms_warehouse p ON t.warehouse_id = p.id
        LEFT JOIN (
            SELECT DISTINCT
                warehouse_id,
                shelf_number,
                shelf_name
            FROM tms_goods_shelves
        ) q ON t.warehouse_id = q.warehouse_id AND t.goods_shelves = q.shelf_number
        ${ew.customSqlSegment}
    </select>
</mapper>
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml
@@ -22,4 +22,12 @@
        LEFT JOIN tms_warehouse p on t.parent_id = p.id
        ${ew.customSqlSegment}
    </select>
    <select id="queryWarehouseDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
        SELECT
            id value,
            ISNULL(warehouse_id, '') + '/' + ISNULL(warehouse_name, '') label,
            ISNULL(warehouse_id, '') + '/' + ISNULL(warehouse_name, '') title
        FROM tms_warehouse
        WHERE status = '1' AND leaf_flag = '1'
    </select>
</mapper>
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IGoodsShelvesMarkService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.tms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.GoodsShelvesMark;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Map;
/**
 * @Description: tms_goods_shelves_mark
 * @Author: jeecg-boot
 * @Date:   2025-05-09
 * @Version: V1.0
 */
public interface IGoodsShelvesMarkService extends IService<GoodsShelvesMark> {
    IPage<GoodsShelvesMark> queryPageList(Page<GoodsShelvesMark> page, Map<String, String[]> parameterMap);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IGoodsShelvesService.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.GoodsShelves;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.vo.DictVo;
import java.util.List;
import java.util.Map;
/**
@@ -16,4 +18,8 @@
public interface IGoodsShelvesService extends IService<GoodsShelves> {
    IPage<GoodsShelves> queryPageList(Page<GoodsShelves> page, Map<String, String[]> parameterMap);
    List<DictVo> queryGoodsShelvesDictList(String warehouseId);
    List<DictVo> queryGoodsShelvesStoreyDictList(String warehouseId, String shelfNumber);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IWarehouseService.java
@@ -5,6 +5,7 @@
import org.jeecg.common.api.vo.CommonGenericTree;
import org.jeecg.modules.tms.entity.Warehouse;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.vo.DictVo;
import java.util.List;
import java.util.Map;
@@ -20,4 +21,6 @@
    List<CommonGenericTree<Warehouse>> loadTree();
    IPage<Warehouse> queryPageList(Page<Warehouse> page, Map<String, String[]> parameterMap);
    List<DictVo> queryWarehouseDictList();
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/GoodsShelvesMarkServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package org.jeecg.modules.tms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.GoodsShelvesMark;
import org.jeecg.modules.tms.mapper.GoodsShelvesMarkMapper;
import org.jeecg.modules.tms.service.IGoodsShelvesMarkService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.Map;
/**
 * @Description: tms_goods_shelves_mark
 * @Author: jeecg-boot
 * @Date:   2025-05-09
 * @Version: V1.0
 */
@Service
public class GoodsShelvesMarkServiceImpl extends ServiceImpl<GoodsShelvesMarkMapper, GoodsShelvesMark> implements IGoodsShelvesMarkService {
    @Override
    public IPage<GoodsShelvesMark> queryPageList(Page<GoodsShelvesMark> page, Map<String, String[]> parameterMap) {
        QueryWrapper<GoodsShelvesMark> queryWrapper = Wrappers.query();
        String[] warehouseIds = parameterMap.get("warehouseId");
        if (warehouseIds != null && warehouseIds.length > 0) {
            queryWrapper.like("t.warehouse_id", warehouseIds[0]);
        }
        String[] goodsShelves = parameterMap.get("goodsShelves");
        if (goodsShelves != null && goodsShelves.length > 0) {
            queryWrapper.like("t.goods_shelves", goodsShelves[0]);
        }
        String[] storeys = parameterMap.get("storey");
        if (storeys != null && storeys.length > 0) {
            queryWrapper.eq("t.storey", storeys[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.queryPageList(page, queryWrapper);
    }
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/GoodsShelvesServiceImpl.java
@@ -5,12 +5,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.GoodsShelves;
import org.jeecg.modules.tms.entity.vo.DictVo;
import org.jeecg.modules.tms.mapper.GoodsShelvesMapper;
import org.jeecg.modules.tms.service.IGoodsShelvesService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.Collections;
import java.util.List;
import java.util.Map;
/**
@@ -52,4 +55,14 @@
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.queryPageList(page, queryWrapper);
    }
    @Override
    public List<DictVo> queryGoodsShelvesDictList(String warehouseId) {
        return this.baseMapper.queryGoodsShelvesDictList(warehouseId);
    }
    @Override
    public List<DictVo> queryGoodsShelvesStoreyDictList(String warehouseId, String shelfNumber) {
        return this.baseMapper.queryGoodsShelvesStoreyDictList(warehouseId, shelfNumber);
    }
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java
@@ -10,6 +10,7 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.StrUtils;
import org.jeecg.modules.tms.entity.Warehouse;
import org.jeecg.modules.tms.entity.vo.DictVo;
import org.jeecg.modules.tms.mapper.WarehouseMapper;
import org.jeecg.modules.tms.service.IWarehouseService;
import org.springframework.stereotype.Service;
@@ -57,6 +58,11 @@
        return this.baseMapper.queryPageList(page, queryWrapper);
    }
    @Override
    public List<DictVo> queryWarehouseDictList() {
        return this.baseMapper.queryWarehouseDictList();
    }
    private List<CommonGenericTree<Warehouse>> loadTree(List<Warehouse> warehouseList) {
        Warehouse warehouse = new Warehouse();
        List<CommonGenericTree<Warehouse>> list = new ArrayList<>();