b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、车船模块fix bug

Browse Source 
2、运力模块fix bug
3、新增设备台账
4、其他bug 修复
5、调整组织、人员模块
This commit is contained in:
b2894lxlx
2026-08-07 08:27:47 +08:00
parent a1eea5075b
commit f716b3fc63
107 changed files with 2269 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/EquipmentLedger.java Normal file
View File

@@ -0,0 +1,41 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
import java.time.LocalDate;
/**
* 设备台账实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_equipment_ledger")
@Schema(description = "设备台账")
public class EquipmentLedger extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
private String vehicleType;
private String vehicleNo;
private String equipmentCode;
private String equipmentName;
private String equipmentBrand;
private String equipmentType;
private String specificationModel;
private LocalDate factoryDate;
private String originalEquipmentNo;
private String remark;
private String attachments;
private Integer onlineStatus;
}

6
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportVehicle.java
View File

@@ -213,5 +213,11 @@ public class TransportVehicle extends TenantEntity {
*/
@Schema(description = "备注")
private String remark;
/** 认证状态：0认证中 1认证通过 2认证驳回 */
@Schema(description = "认证状态：0认证中 1认证通过 2认证驳回")
private Integer certificationStatus;
/** 认证驳回原因 */
@Schema(description = "认证驳回原因")
private String certificationRejectReason;
}

29
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EquipmentLedgerVO.java Normal file
View File

@@ -0,0 +1,29 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.transport.pojo.entity.EquipmentLedger;
import java.io.Serial;
/**
* 设备台账视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "设备台账")
public class EquipmentLedgerVO extends EquipmentLedger {
@Serial
private static final long serialVersionUID = 1L;
@TableField(exist = false)
private String updateUserName;
}