Merge remote-tracking branch 'origin/master'

lyh

2025-05-08 85e36a5016633748bbd76bb4ddaef49566a505d5

Merge remote-tracking branch 'origin/master'

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml

@@ -14,7 +14,7 @@
                <when test="equipmentIds != null and equipmentIds.size() > 0 ">
                    AND t2.equipment_code IN
                    <foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=",">
                        {equipmentId}
                        #{equipmentId}
                    </foreach>
                </when>
                <otherwise>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessQuantityMapper.xml

@@ -123,6 +123,6 @@
            mpq.update_by updateBy,
            mpq.update_time updateTime
        FROM mdc_process_quantity mpq LEFT JOIN mdc_standard_process_duration mspd ON mpq.standard_id = mspd.id
        WHERE mpq.id = { id }
        WHERE mpq.id = #{ id }
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/GoodsShelvesController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,177 @@
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 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.GoodsShelves;
import org.jeecg.modules.tms.service.IGoodsShelvesService;

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
 * @Author: jeecg-boot
 * @Date:   2025-05-08
 * @Version: V1.0
 */
@Api(tags="tms_goods_shelves")
@RestController
@RequestMapping("/tms/goodsShelves")
@Slf4j
public class GoodsShelvesController extends JeecgController<GoodsShelves, IGoodsShelvesService> {
    @Autowired
    private IGoodsShelvesService goodsShelvesService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param goodsShelves
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "tms_goods_shelves-分页列表查询")
    @ApiOperation(value="tms_goods_shelves-分页列表查询", notes="tms_goods_shelves-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<GoodsShelves>> queryPageList(GoodsShelves goodsShelves,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        Map<String, String[]> parameterMap = req.getParameterMap();
        Page<GoodsShelves> page = new Page<GoodsShelves>(pageNo, pageSize);
        IPage<GoodsShelves> pageList = goodsShelvesService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }
	
    /**
     *   æ·»åŠ 
     *
     * @param goodsShelves
     * @return
     */
    @AutoLog(value = "tms_goods_shelves-添加")
    @ApiOperation(value="tms_goods_shelves-添加", notes="tms_goods_shelves-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody GoodsShelves goodsShelves) {
        goodsShelvesService.save(goodsShelves);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param goodsShelves
     * @return
     */
    @AutoLog(value = "tms_goods_shelves-编辑")
    @ApiOperation(value="tms_goods_shelves-编辑", notes="tms_goods_shelves-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody GoodsShelves goodsShelves) {
        goodsShelvesService.updateById(goodsShelves);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "tms_goods_shelves-通过id删除")
    @ApiOperation(value="tms_goods_shelves-通过id删除", notes="tms_goods_shelves-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        goodsShelvesService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "tms_goods_shelves-批量删除")
    @ApiOperation(value="tms_goods_shelves-批量删除", notes="tms_goods_shelves-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.goodsShelvesService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "tms_goods_shelves-通过id查询")
    @ApiOperation(value="tms_goods_shelves-通过id查询", notes="tms_goods_shelves-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<GoodsShelves> queryById(@RequestParam(name="id",required=true) String id) {
        GoodsShelves goodsShelves = goodsShelvesService.getById(id);
        if(goodsShelves==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(goodsShelves);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param goodsShelves
    */
    //@RequiresPermissions("org.jeecg.modules:tms_goods_shelves:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, GoodsShelves goodsShelves) {
        return super.exportXls(request, goodsShelves, GoodsShelves.class, "tms_goods_shelves");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("tms_goods_shelves:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, GoodsShelves.class);
    }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java

@@ -9,6 +9,8 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.api.vo.CommonGenericTree;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
@@ -66,11 +68,18 @@
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<Warehouse> queryWrapper = QueryGenerator.initQueryWrapper(warehouse, req.getParameterMap());
        Map<String, String[]> parameterMap = req.getParameterMap();
        Page<Warehouse> page = new Page<Warehouse>(pageNo, pageSize);
        IPage<Warehouse> pageList = warehouseService.page(page, queryWrapper);
        IPage<Warehouse> pageList = warehouseService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }

    @ApiOperation(value="tms_warehouse-加载树形结构数据", notes="tms_warehouse-加载树形结构数据")
    @GetMapping(value = "/loadTree")
    public Result<?> loadTree() {
        List<CommonGenericTree<Warehouse>> treeList = warehouseService.loadTree();
        return Result.OK(treeList);
    }
    
    /**
     *   æ·»åŠ 

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelves.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,99 @@
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
 * @Author: jeecg-boot
 * @Date:   2025-05-08
 * @Version: V1.0
 */
@Data
@TableName("tms_goods_shelves")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tms_goods_shelves对象", description="tms_goods_shelves")
public class GoodsShelves implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**仓库编号(关联字段，存仓库表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 locationCode;
    /**层数*/
    @Excel(name = "层数", width = 15)
    @ApiModelProperty(value = "层数")
    private String storey;
    /**排数*/
    @Excel(name = "排数", width = 15)
    @ApiModelProperty(value = "排数")
    private String arrange;
    /**列数*/
    @Excel(name = "列数", width = 15)
    @ApiModelProperty(value = "列数")
    private String columnNumber;
    /**格数(默认值为1)*/
    @Excel(name = "格数(默认值为1)", width = 15)
    @ApiModelProperty(value = "格数(默认值为1)")
    private String cellsNum;
    /**货架编号*/
    @Excel(name = "货架编号", width = 15)
    @ApiModelProperty(value = "货架编号")
    private String shelfNumber;
    /**货架名称*/
    @Excel(name = "货架名称", width = 15)
    @ApiModelProperty(value = "货架名称")
    private String shelfName;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**租户号*/
    @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/Warehouse.java

@@ -4,12 +4,11 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -48,6 +47,12 @@
    @Excel(name = "父节点编号", width = 15)
    @ApiModelProperty(value = "父节点编号")
    private String parentId;
    /**父节点仓库编号*/
    @TableField(exist = false)
    private String parentWarehouseId;
    /**父节点仓库名称*/
    @TableField(exist = false)
    private String parentWarehouseName;
    /**展示序号*/
    @Excel(name = "展示序号", width = 15)
    @ApiModelProperty(value = "展示序号")
@@ -71,21 +76,21 @@
    /**创建人*/
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    private String createdBy;
    private String createBy;
    /**创建时间*/
    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createdTime;
    private Date createTime;
    /**更新人*/
    @Excel(name = "更新人", width = 15)
    @ApiModelProperty(value = "更新人")
    private String updatedBy;
    private String updateBy;
    /**更新时间*/
    @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd HH:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
    @ApiModelProperty(value = "更新时间")
    private Date updatedTime;
    private Date updateTime;
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/GoodsShelvesMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package org.jeecg.modules.tms.mapper;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.GoodsShelves;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: tms_goods_shelves
 * @Author: jeecg-boot
 * @Date:   2025-05-08
 * @Version: V1.0
 */
public interface GoodsShelvesMapper extends BaseMapper<GoodsShelves> {

    IPage<GoodsShelves> queryPageList(Page<GoodsShelves> page,
                                      @Param(Constants.WRAPPER) Wrapper<GoodsShelves> queryWrapper);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/WarehouseMapper.java

@@ -2,6 +2,11 @@

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.Warehouse;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +19,6 @@
 */
public interface WarehouseMapper extends BaseMapper<Warehouse> {

    IPage<Warehouse> queryPageList(Page<Warehouse> page,
                                   @Param(Constants.WRAPPER) Wrapper<Warehouse> queryWrapper);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
<?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.GoodsShelvesMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.GoodsShelves">
        SELECT
            t.id,
            t.warehouse_id warehouseId,
            p.warehouse_id warehouseNum,
            p.warehouse_name warehouseName,
            t.location_code locationCode,
            t.storey storey,
            t.arrange arrange,
            t.column_number columnNumber,
            t.cells_num cellsNum,
            t.shelf_number shelfNumber,
            t.shelf_name shelfName,
            t.remark,
            t.create_by createBy,
            t.create_time createTime
        FROM tms_goods_shelves t
        LEFT JOIN tms_warehouse p on t.warehouse_id = p.id
        ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml

@@ -2,4 +2,24 @@
<!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.WarehouseMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.Warehouse">
        SELECT
            t.id,
            t.warehouse_id warehouseId,
            t.warehouse_name warehouseName,
            t.parent_id parentId,
            p.warehouse_id parentWarehouseId,
            p.warehouse_name parentWarehouseName,
            t.seq,
            t.leaf_flag leafFlag,
            t.status,
            t.remark,
            t.create_by createBy,
            t.create_time createTime,
            t.update_by updateBy,
            t.update_time updateTime
        FROM tms_warehouse t
        LEFT JOIN tms_warehouse p on t.parent_id = p.id
        ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IGoodsShelvesService.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.GoodsShelves;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.Map;

/**
 * @Description: tms_goods_shelves
 * @Author: jeecg-boot
 * @Date:   2025-05-08
 * @Version: V1.0
 */
public interface IGoodsShelvesService extends IService<GoodsShelves> {

    IPage<GoodsShelves> queryPageList(Page<GoodsShelves> page, Map<String, String[]> parameterMap);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IWarehouseService.java

@@ -1,7 +1,13 @@
package org.jeecg.modules.tms.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.api.vo.CommonGenericTree;
import org.jeecg.modules.tms.entity.Warehouse;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;

/**
 * @Description: tms_warehouse
@@ -11,4 +17,7 @@
 */
public interface IWarehouseService extends IService<Warehouse> {

    List<CommonGenericTree<Warehouse>> loadTree();

    IPage<Warehouse> queryPageList(Page<Warehouse> page, Map<String, String[]> parameterMap);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/GoodsShelvesServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
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.GoodsShelves;
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.Map;

/**
 * @Description: tms_goods_shelves
 * @Author: jeecg-boot
 * @Date:   2025-05-08
 * @Version: V1.0
 */
@Service
public class GoodsShelvesServiceImpl extends ServiceImpl<GoodsShelvesMapper, GoodsShelves> implements IGoodsShelvesService {

    @Override
    public IPage<GoodsShelves> queryPageList(Page<GoodsShelves> page, Map<String, String[]> parameterMap) {
        QueryWrapper<GoodsShelves> queryWrapper = Wrappers.query();
        String[] warehouseIds = parameterMap.get("warehouseId");
        if (warehouseIds != null && warehouseIds.length > 0) {
            queryWrapper.eq("t.warehouse_id", warehouseIds[0]);
        }
        String[] warehouseNames = parameterMap.get("warehouseName");
        if (warehouseNames != null && warehouseNames.length > 0) {
            queryWrapper.like("p.warehouse_name", warehouseNames[0]);
        }
        String[] locationCodes = parameterMap.get("locationCode");
        if (locationCodes != null && locationCodes.length > 0) {
            queryWrapper.like("t.location_code", locationCodes[0]);
        }
        String[] shelfNumbers = parameterMap.get("shelfNumber");
        if (shelfNumbers != null && shelfNumbers.length > 0) {
            queryWrapper.like("t.shelf_number", shelfNumbers[0]);
        }
        String[] beginTimes = parameterMap.get("beginTime");
        String[] endTimes = parameterMap.get("endTime");
        if (beginTimes != null && beginTimes.length > 0) {
            queryWrapper.ge("t.create_time", beginTimes[0]);
        }
        if (endTimes != null && endTimes.length > 0) {
            queryWrapper.le("t.create_time", endTimes[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.queryPageList(page, queryWrapper);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java

@@ -1,11 +1,22 @@
package org.jeecg.modules.tms.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.api.vo.CommonGenericTree;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.StrUtils;
import org.jeecg.modules.tms.entity.Warehouse;
import org.jeecg.modules.tms.mapper.WarehouseMapper;
import org.jeecg.modules.tms.service.IWarehouseService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.*;

/**
 * @Description: tms_warehouse
@@ -16,4 +27,108 @@
@Service
public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements IWarehouseService {

    @Override
    public List<CommonGenericTree<Warehouse>> loadTree() {
        List<Warehouse> warehouseList = list(new LambdaQueryWrapper<Warehouse>()
                .eq(Warehouse::getStatus, CommonConstant.STATUS_1));
        return loadTree(warehouseList);
    }

    @Override
    public IPage<Warehouse> queryPageList(Page<Warehouse> page, Map<String, String[]> parameterMap) {
        QueryWrapper<Warehouse> queryWrapper = Wrappers.query();
        String[] warehouseNames = parameterMap.get("warehouseName");
        if (warehouseNames != null && warehouseNames.length > 0) {
            queryWrapper.like("t.warehouse_name", warehouseNames[0]);
        }
        String[] parentIds = parameterMap.get("parentId");
        if (parentIds != null && parentIds.length > 0) {
            queryWrapper.eq("t.parent_id", parentIds[0]);
        }
        String[] beginTimes = parameterMap.get("beginTime");
        String[] endTimes = parameterMap.get("endTime");
        if (beginTimes != null && beginTimes.length > 0) {
            queryWrapper.ge("t.create_time", beginTimes[0]);
        }
        if (endTimes != null && endTimes.length > 0) {
            queryWrapper.le("t.create_time", endTimes[0]);
        }
        queryWrapper.orderByAsc("t.seq");
        return this.baseMapper.queryPageList(page, queryWrapper);
    }

    private List<CommonGenericTree<Warehouse>> loadTree(List<Warehouse> warehouseList) {
        Warehouse warehouse = new Warehouse();
        List<CommonGenericTree<Warehouse>> list = new ArrayList<>();
        Map<String, CommonGenericTree<Warehouse>> map = new HashMap<>();
        CommonGenericTree<Warehouse> node = new CommonGenericTree<>();//手动创建根节点
        node.setKey("-1");
        node.setTitle("航宇救生");
        node.setRField1("");
        node.setRField2("");
        node.setEntity(new Warehouse()
                .setId("-1")
                .setWarehouseId("-1")
                .setWarehouseName("航宇救生")
                .setLeafFlag("2"));
        list.add(node);
        if (CollectionUtils.isNotEmpty(warehouseList)) {
            CommonGenericTree<Warehouse> tcNode;
            for (Warehouse wh : warehouseList) {
                if (StrUtils.isBlankOrNull(wh.getParentId()) || wh.getParentId().equals("-1")) {
                    tcNode = new CommonGenericTree<>();
                    tcNode.setKey(wh.getId());
                    tcNode.setTitle(wh.getWarehouseId() + "/" + wh.getWarehouseName());
                    tcNode.setParentId(node.getKey());
                    tcNode.setIcon("");
                    tcNode.setType(1);
                    tcNode.setValue(wh.getWarehouseName());
                    //tcNode.setDisabled(CommonConstant.STATUS_0.equals(wh.getStatus()) ? true : false);
                    tcNode.setRField1(wh.getWarehouseId());
                    tcNode.setRField2(getBaseParent(wh.getId(), 0).getWarehouseId());
                    tcNode.setEntity(wh);
                    node.addChildren(tcNode);
                    map.put(wh.getId(), tcNode);
                }
            }
            CommonGenericTree<Warehouse> childNode;
            for (Warehouse wh : warehouseList) {
                Warehouse child = wh;
                if (map.containsKey(child.getParentId())) {
                    if (StrUtils.isBlankOrNull(wh.getParentId()) || wh.getParentId().equals("-1")) {
                        warehouse = wh;
                    } else {
                        tcNode = map.get(child.getParentId());
                        childNode = new CommonGenericTree<>();
                        childNode.setKey(wh.getId());
                        childNode.setTitle(wh.getWarehouseId() + "/" + wh.getWarehouseName());
                        childNode.setParentId(wh.getParentId());
                        childNode.setIcon("");
                        childNode.setType(0);
                        childNode.setValue(wh.getWarehouseName());
                        //childNode.setDisabled(CommonConstant.STATUS_0.equals(wh.getStatus()) ? true : false);
                        childNode.setRField1(wh.getWarehouseId());
                        childNode.setRField2(getBaseParent(wh.getId(), 0).getWarehouseId());
                        childNode.setEntity(wh);
                        tcNode.addChildren(childNode);
                        map.put(child.getId(), childNode);
                    }
                }
            }
        }
        return list;
    }

    public Warehouse getBaseParent(String id, int index) {
        Warehouse warehouse = null;
        if (index < 99) {
            warehouse = getById(id);
            if (StrUtils.isNotBlankOrNull(warehouse.getParentId())) {
                if (!warehouse.getParentId().equals("-1")) {
                    warehouse = getBaseParent(warehouse.getParentId(), index++);
                }
            }
        }
        return warehouse;
    }
}