Merge remote-tracking branch 'origin/dev' into dev

2 years ago · 16b394bd58
17 changed files with 1018 additions and 9 deletions
--- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java
+++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java
@ -0,0 +1,196 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 叉车信息 实体类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@Data
+@TableName("logpm_basic_forklift")
+@ApiModel(value = "BasicForklift对象", description = "叉车信息")
+@EqualsAndHashCode(callSuper = true)
+public class BasicForkliftEntity extends TenantEntity {
+
+	/**
+	 * 事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线
+	 */
+	@ApiModelProperty(value = "事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线")
+	private Integer businessLine;
+	/**
+	 * 使用单位
+	 */
+	@ApiModelProperty(value = "使用单位")
+	private String useUnit;
+	/**
+	 * 受票主体
+	 */
+	@ApiModelProperty(value = "受票主体")
+	private String ticketRecipient;
+	/**
+	 * 供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛
+	 */
+	@ApiModelProperty(value = "供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛")
+	private Integer supplier;
+	/**
+	 * 资产类型;1-自有,2-租凭
+	 */
+	@ApiModelProperty(value = "资产类型;1-自有,2-租凭")
+	private Integer assetType;
+	/**
+	 * 类型;1-高叉,2-托盘车,3-坐叉
+	 */
+	@ApiModelProperty(value = "类型;1-高叉,2-托盘车,3-坐叉")
+	private Integer forkliftType;
+	/**
+	 * 摘要
+	 */
+	@ApiModelProperty(value = "摘要")
+	private String abstracts;
+	/**
+	 * 载重;单位（T）
+	 */
+	@ApiModelProperty(value = "载重;单位（T）")
+	private BigDecimal load;
+	/**
+	 * 载高;单位（M）
+	 */
+	@ApiModelProperty(value = "载高;单位（M）")
+	private BigDecimal loadHeight;
+	/**
+	 * 整车尺寸;长*宽*高
+	 */
+	@ApiModelProperty(value = "整车尺寸;长*宽*高")
+	private String vehicleSize;
+	/**
+	 * 货叉宽度;（MAX外宽,单位M）
+	 */
+	@ApiModelProperty(value = "货叉宽度;（MAX外宽,单位M）")
+	private BigDecimal forkArmsWidth;
+	/**
+	 * 货叉长度;(单位M)
+	 */
+	@ApiModelProperty(value = "货叉长度;(单位M)")
+	private BigDecimal forkArmsHeight;
+	/**
+	 * 最小转弯半径;(单位M)
+	 */
+	@ApiModelProperty(value = "最小转弯半径;(单位M)")
+	private BigDecimal minimumTurningRadius;
+	/**
+	 * 通道宽度;((min),单位M)
+	 */
+	@ApiModelProperty(value = "通道宽度;((min),单位M)")
+	private BigDecimal channelWidth;
+	/**
+	 * 月租;(元/月)
+	 */
+	@ApiModelProperty(value = "月租;(元/月)")
+	private BigDecimal monthlyRent;
+	/**
+	 * 数量;（台）
+	 */
+	@ApiModelProperty(value = "数量;（台）")
+	private Integer number;
+	/**
+	 * 合同编号
+	 */
+	@ApiModelProperty(value = "合同编号")
+	private String contractNumber;
+	/**
+	 * 起租期限;中文大写
+	 */
+	@ApiModelProperty(value = "起租期限;中文大写")
+	private String leaseStartPeriod;
+	/**
+	 * 租赁开始时间
+	 */
+	@ApiModelProperty(value = "租赁开始时间")
+	private Date leaseStartTime;
+	/**
+	 * 租赁结束时间
+	 */
+	@ApiModelProperty(value = "租赁结束时间")
+	private Date leaseEndTime;
+	/**
+	 * 付款周期;(月)
+	 */
+	@ApiModelProperty(value = "付款周期;(月)")
+	private Integer paymentCycle;
+	/**
+	 * 押金;（元）
+	 */
+	@ApiModelProperty(value = "押金;（元）")
+	private BigDecimal deposit;
+	/**
+	 * 付款方式;1-先付后租,2-先租后付
+	 */
+	@ApiModelProperty(value = "付款方式;1-先付后租,2-先租后付")
+	private Integer paymentMethod;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String notes;
+	/**
+	 * 整车图片
+	 */
+	@ApiModelProperty(value = "整车图片")
+	private String forkliftPhoto;
+	/**
+	 * 所属仓库
+	 */
+	@ApiModelProperty(value = "所属仓库")
+	private String owningWarehouse;
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+}
--- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicForkliftClient.java
+++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicForkliftClient.java
@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.feign;
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basic.entity.BasicForkliftEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 叉车信息 Feign接口类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@FeignClient(
+	value = LauncherConstant.APPLICATION_BASIC_NAME
+)
+public interface IBasicForkliftClient {
+
+    String API_PREFIX = "forklift/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取叉车信息列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicForkliftEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}
--- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPdaClient.java
+++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPdaClient.java
@ -18,6 +18,7 @@ package com.logpm.basic.feign;
 */

 import com.logpm.basic.entity.BasicPdaEntity;
+import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@ -30,11 +31,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 * @since 2023-05-08
 */
@FeignClient(
-	value = "basic"
+	value = LauncherConstant.APPLICATION_BASIC_NAME
 )
 public interface IBasicPdaClient {

-	String API_PREFIX = "/client";
+	String API_PREFIX = "pda/client";
 	String TOP = API_PREFIX + "/top";

 	/**
--- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicForkliftVO.java
+++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicForkliftVO.java
@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.vo;
+
+import com.logpm.basic.entity.BasicForkliftEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 叉车信息 视图实体类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicForkliftVO extends BasicForkliftEntity {
+	private static final long serialVersionUID = 1L;
+
+}
--- a/blade-service/logpm-basic/pom.xml
+++ b/blade-service/logpm-basic/pom.xml
@ -18,13 +18,11 @@
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-swagger</artifactId>
        </dependency>
-
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>logpm-basic-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
-
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-excel</artifactId>
@ -33,6 +31,14 @@



+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-dict-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+
+
+
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-core-auto</artifactId>
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java
@ -16,7 +16,7 @@ import org.springblade.core.launch.BladeApplication;
 public class BasicApplication {

 	public static void main(String[] args) {
-		BladeApplication.run(LauncherConstant.APPLICATION_BASIC_NAME, BasicApplication.class, args);
+		BladeApplication.run(LauncherConstant.APPLICATION_BASIC_NAME.concat("-lmy"), BasicApplication.class, args);
 	}

 }
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicForkliftController.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicForkliftController.java
@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basic.entity.BasicForkliftEntity;
+import com.logpm.basic.vo.BasicForkliftVO;
+import com.logpm.basic.excel.BasicForkliftExcel;
+import com.logpm.basic.service.IBasicForkliftService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 叉车信息 控制器
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/forklift")
+@Api(value = "叉车信息", tags = "叉车信息接口")
+public class BasicForkliftController extends BladeController {
+
+	private final IBasicForkliftService basicForkliftService;
+
+	/**
+	 * 叉车信息 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicForklift")
+	public R<BasicForkliftEntity> detail(BasicForkliftEntity basicForklift) {
+		BasicForkliftEntity detail = basicForkliftService.getOne(Condition.getQueryWrapper(basicForklift));
+		return R.data(detail);
+	}
+	/**
+	 * 叉车信息 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicForklift")
+	public R<IPage<BasicForkliftEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicForklift, Query query) {
+		IPage<BasicForkliftEntity> pages = basicForkliftService.page(Condition.getPage(query), Condition.getQueryWrapper(basicForklift, BasicForkliftEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 叉车信息 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicForklift")
+	public R<IPage<BasicForkliftVO>> page(BasicForkliftVO basicForklift, Query query) {
+		IPage<BasicForkliftVO> pages = basicForkliftService.selectBasicForkliftPage(Condition.getPage(query), basicForklift);
+		return R.data(pages);
+	}
+
+	/**
+	 * 叉车信息 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicForklift")
+	public R save(@Valid @RequestBody BasicForkliftEntity basicForklift) {
+		return R.status(basicForkliftService.save(basicForklift));
+	}
+
+	/**
+	 * 叉车信息 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicForklift")
+	public R update(@Valid @RequestBody BasicForkliftEntity basicForklift) {
+		return R.status(basicForkliftService.updateById(basicForklift));
+	}
+
+	/**
+	 * 叉车信息 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicForklift")
+	public R submit(@Valid @RequestBody BasicForkliftEntity basicForklift) {
+		return R.status(basicForkliftService.saveOrUpdate(basicForklift));
+	}
+
+	/**
+	 * 叉车信息 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicForkliftService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicForklift")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicForklift")
+	public void exportBasicForklift(@ApiIgnore @RequestParam Map<String, Object> basicForklift, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicForkliftEntity> queryWrapper = Condition.getQueryWrapper(basicForklift, BasicForkliftEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicForklift::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicForkliftEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicForkliftExcel> list = basicForkliftService.exportBasicForklift(queryWrapper);
+		ExcelUtil.export(response, "叉车信息数据" + DateUtil.time(), "叉车信息数据表", list, BasicForkliftExcel.class);
+	}
+
+}
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java
@ -34,6 +34,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.cloud.commons.util.IdUtils;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@ -43,6 +44,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.UUID;
 import javax.servlet.http.HttpServletResponse;

 /**
@ -55,7 +57,7 @@ import javax.servlet.http.HttpServletResponse;
@AllArgsConstructor
@RequestMapping("/pda")
@Api(value = "pda信息", tags = "pda信息接口")
-public class PdaController extends BladeController {
+public class BasicPdaController extends BladeController {

 	private final IBasicPdaService basicPdaService;

@ -100,6 +102,7 @@ public class PdaController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入BasicPda")
 	public R save(@Valid @RequestBody BasicPdaEntity BasicPda) {
+
 		return R.status(basicPdaService.save(BasicPda));
 	}

--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicForkliftDTO.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicForkliftDTO.java
@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.dto;
+
+import com.logpm.basic.entity.BasicForkliftEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 叉车信息 数据传输对象实体类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicForkliftDTO extends BasicForkliftEntity {
+	private static final long serialVersionUID = 1L;
+
+}
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicForkliftExcel.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicForkliftExcel.java
@ -0,0 +1,244 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 叉车信息 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicForkliftExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除;1-未删除，2-已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除;1-未删除，2-已删除")
+	private Integer isDeleted;
+	/**
+	 * 事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线")
+	private Integer businessLine;
+	/**
+	 * 使用单位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("使用单位")
+	private String useUnit;
+	/**
+	 * 受票主体
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("受票主体")
+	private String ticketRecipient;
+	/**
+	 * 供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛")
+	private Integer supplier;
+	/**
+	 * 资产类型;1-自有,2-租凭
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("资产类型;1-自有,2-租凭")
+	private Integer assetType;
+	/**
+	 * 类型;1-高叉,2-托盘车,3-坐叉
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型;1-高叉,2-托盘车,3-坐叉")
+	private Integer forkliftType;
+	/**
+	 * 摘要
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("摘要")
+	private String abstracts;
+	/**
+	 * 载重;单位（T）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("载重;单位（T）")
+	private BigDecimal load;
+	/**
+	 * 载高;单位（M）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("载高;单位（M）")
+	private BigDecimal loadHeight;
+	/**
+	 * 整车尺寸;长*宽*高
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("整车尺寸;长*宽*高")
+	private String vehicleSize;
+	/**
+	 * 货叉宽度;（MAX外宽,单位M）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货叉宽度;（MAX外宽,单位M）")
+	private BigDecimal forkArmsWidth;
+	/**
+	 * 货叉长度;(单位M)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货叉长度;(单位M)")
+	private BigDecimal forkArmsHeight;
+	/**
+	 * 最小转弯半径;(单位M)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最小转弯半径;(单位M)")
+	private BigDecimal minimumTurningRadius;
+	/**
+	 * 通道宽度;((min),单位M)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("通道宽度;((min),单位M)")
+	private BigDecimal channelWidth;
+	/**
+	 * 月租;(元/月)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("月租;(元/月)")
+	private BigDecimal monthlyRent;
+	/**
+	 * 数量;（台）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("数量;（台）")
+	private Integer number;
+	/**
+	 * 合同编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("合同编号")
+	private String contractNumber;
+	/**
+	 * 起租期限;中文大写
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("起租期限;中文大写")
+	private String leaseStartPeriod;
+	/**
+	 * 租赁开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租赁开始时间")
+	private Date leaseStartTime;
+	/**
+	 * 租赁结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租赁结束时间")
+	private Date leaseEndTime;
+	/**
+	 * 付款周期;(月)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("付款周期;(月)")
+	private Integer paymentCycle;
+	/**
+	 * 押金;（元）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("押金;（元）")
+	private BigDecimal deposit;
+	/**
+	 * 付款方式;1-先付后租,2-先租后付
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("付款方式;1-先付后租,2-先租后付")
+	private Integer paymentMethod;
+	/**
+	 * 备注
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String notes;
+	/**
+	 * 整车图片
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("整车图片")
+	private String forkliftPhoto;
+	/**
+	 * 所属仓库
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("所属仓库")
+	private String owningWarehouse;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+
+}
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicForkliftClient.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicForkliftClient.java
@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basic.entity.BasicForkliftEntity;
+import com.logpm.basic.service.IBasicForkliftService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 叉车信息 Feign实现类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicForkliftClient implements IBasicForkliftClient {
+
+    private final IBasicForkliftService basicForkliftService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicForkliftEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicForkliftEntity> page = basicForkliftService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPdaClient.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPdaClient.java
@ -39,7 +39,7 @@ import springfox.documentation.annotations.ApiIgnore;
@AllArgsConstructor
 public class BasicPdaClient implements IBasicPdaClient {

-	private final IBasicPdaService BasicPdaService;
+	private final IBasicPdaService basicPdaService;

 	@Override
 	@GetMapping(TOP)
@ -47,7 +47,7 @@ public class BasicPdaClient implements IBasicPdaClient {
 		Query query = new Query();
 		query.setCurrent(current);
 		query.setSize(size);
-		IPage<BasicPdaEntity> page = BasicPdaService.page(Condition.getPage(query));
+		IPage<BasicPdaEntity> page = basicPdaService.page(Condition.getPage(query));
 		return BladePage.of(page);
 	}

--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.java
@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.mapper;
+
+import com.logpm.basic.entity.BasicForkliftEntity;
+import com.logpm.basic.vo.BasicForkliftVO;
+import com.logpm.basic.excel.BasicForkliftExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 叉车信息 Mapper 接口
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+public interface BasicForkliftMapper extends BaseMapper<BasicForkliftEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicForklift
+	 * @return
+	 */
+	List<BasicForkliftVO> selectBasicForkliftPage(IPage page, BasicForkliftVO basicForklift);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicForkliftExcel> exportBasicForklift(@Param("ew") Wrapper<BasicForkliftEntity> queryWrapper);
+
+}
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.xml
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.xml
@ -0,0 +1,59 @@
+<?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.logpm.basic.mapper.BasicForkliftMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicForkliftResultMap" type="com.logpm.basic.entity.BasicForkliftEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="business_line" property="businessLine"/>
+        <result column="use_unit" property="useUnit"/>
+        <result column="ticket_recipient" property="ticketRecipient"/>
+        <result column="supplier" property="supplier"/>
+        <result column="asset_type" property="assetType"/>
+        <result column="forklift_type" property="forkliftType"/>
+        <result column="abstracts" property="abstracts"/>
+        <result column="load" property="load"/>
+        <result column="load_height" property="loadHeight"/>
+        <result column="vehicle_size" property="vehicleSize"/>
+        <result column="fork_arms_width" property="forkArmsWidth"/>
+        <result column="fork_arms_height" property="forkArmsHeight"/>
+        <result column="minimum_turning_radius" property="minimumTurningRadius"/>
+        <result column="channel_width" property="channelWidth"/>
+        <result column="monthly_rent" property="monthlyRent"/>
+        <result column="number" property="number"/>
+        <result column="contract_number" property="contractNumber"/>
+        <result column="lease_start_period" property="leaseStartPeriod"/>
+        <result column="lease_start_time" property="leaseStartTime"/>
+        <result column="lease_end_time" property="leaseEndTime"/>
+        <result column="payment_cycle" property="paymentCycle"/>
+        <result column="deposit" property="deposit"/>
+        <result column="payment_method" property="paymentMethod"/>
+        <result column="notes" property="notes"/>
+        <result column="forklift_photo" property="forkliftPhoto"/>
+        <result column="owning_warehouse" property="owningWarehouse"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+    </resultMap>
+
+
+    <select id="selectBasicForkliftPage" resultMap="basicForkliftResultMap">
+        select * from logpm_basic_forklift where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicForklift" resultType="com.logpm.basic.excel.BasicForkliftExcel">
+        SELECT * FROM logpm_basic_forklift ${ew.customSqlSegment}
+    </select>
+
+</mapper>
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicForkliftService.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicForkliftService.java
@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basic.entity.BasicForkliftEntity;
+import com.logpm.basic.vo.BasicForkliftVO;
+import com.logpm.basic.excel.BasicForkliftExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 叉车信息 服务类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+public interface IBasicForkliftService extends BaseService<BasicForkliftEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicForklift
+	 * @return
+	 */
+	IPage<BasicForkliftVO> selectBasicForkliftPage(IPage<BasicForkliftVO> page, BasicForkliftVO basicForklift);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicForkliftExcel> exportBasicForklift(Wrapper<BasicForkliftEntity> queryWrapper);
+
+}
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicForkliftServiceImpl.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicForkliftServiceImpl.java
@ -0,0 +1,55 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.service.impl;
+
+
+import com.logpm.basic.entity.BasicForkliftEntity;
+import com.logpm.basic.excel.BasicForkliftExcel;
+import com.logpm.basic.mapper.BasicForkliftMapper;
+import com.logpm.basic.service.IBasicForkliftService;
+import com.logpm.basic.vo.BasicForkliftVO;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 叉车信息 服务实现类
+ *
+ * @author lmy
+ * @since 2023-05-08
+ */
+@Service
+public class BasicForkliftServiceImpl extends BaseServiceImpl<BasicForkliftMapper, BasicForkliftEntity> implements IBasicForkliftService {
+
+	@Override
+	public IPage<BasicForkliftVO> selectBasicForkliftPage(IPage<BasicForkliftVO> page, BasicForkliftVO basicForklift) {
+		return page.setRecords(baseMapper.selectBasicForkliftPage(page, basicForklift));
+	}
+
+
+	@Override
+	public List<BasicForkliftExcel> exportBasicForklift(Wrapper<BasicForkliftEntity> queryWrapper) {
+		List<BasicForkliftExcel> basicForkliftList = baseMapper.exportBasicForklift(queryWrapper);
+		//basicForkliftList.forEach(basicForklift -> {
+		//	basicForklift.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicForklift.getType()));
+		//});
+		return basicForkliftList;
+	}
+
+}
--- a/doc/dpm/物流租户系统.pdma.json
+++ b/doc/dpm/物流租户系统.pdma.json
@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.5.1",
  "createdTime": "2023-3-27 13:32:56",
-  "updatedTime": "2023-5-6 17:44:25",
+  "updatedTime": "2023-5-8 17:51:56",
  "dbConns": [],
  "profile": {
    "default": {
@ -17942,6 +17942,23 @@
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "9A2DE488-B987-42ED-8F37-8341C683839C",
          "uiHint": null
+        },
+        {
+          "defKey": "payer",
+          "defName": "付款人",
+          "comment": "1发货方 2 收货方",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D9C83E3D-49E7-457F-8691-FB83DB0ECEAF"
        }
      ],
      "correlations": [],