Merge remote-tracking branch 'origin/master'

lyh

2025-05-08 85e36a5016633748bbd76bb4ddaef49566a505d5

 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);
   }
   
   /**
    *   添加