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

1、修复菜单无法编辑

Browse Source 
2、完善运输计划
3、完善运单管理
4、新增配置管理
This commit is contained in:
b2894lxlx
2026-08-04 20:53:57 +08:00
parent 30c51ba271
commit 62a110b6de
23 changed files with 2081 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
blade-service-api/blade-file-api/src/main/java/org/springblade/file/pojo/dto/FileCertificateBatchRecognitionDTO.java
View File

@@ -37,9 +37,33 @@ public class FileCertificateBatchRecognitionDTO implements Serializable {
* 目录名称
*/
private String dirName;
/**
* 磅单 obs key列表
*/
private List<String> poundUrls;
/**
* 车头 obs key列表
*/
private List<String> carFrontUrls;
/**
* 驾驶证 obs key列表
*/
private List<String> driverLicenseUrls;
/**
* 行驶证 obs key列表
*/
private List<String> vehicleLicenseUrls;
public FileCertificateBatchRecognitionDTO(List<String> objectKeys) {
this.objectKeys = objectKeys;
}
public FileCertificateBatchRecognitionDTO(
List<String> objectKeys, String projectAbbreviation, String code, String dirName) {
this.objectKeys = objectKeys;
this.projectAbbreviation = projectAbbreviation;
this.code = code;
this.dirName = dirName;
}
}

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

@@ -0,0 +1,143 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
*/
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.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 配载管理实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_loading_manage")
@Schema(description = "配载管理")
public class LoadingManage extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "配载单号")
private String loadingNo;
@Schema(description = "配载子单号")
private String loadingSubNos;
@Schema(description = "运单ID集合")
private String waybillIdsJson;
@Schema(description = "项目ID")
private Long projectId;
@Schema(description = "项目名称")
private String projectName;
@Schema(description = "客户名称")
private String customerName;
@Schema(description = "运输类型")
private String transportType;
@Schema(description = "货物类型")
private String cargoType;
@Schema(description = "货物名称")
private String cargoName;
@Schema(description = "车/船/航班/班列")
private String vehicleNo;
@Schema(description = "挂车车牌号")
private String trailerVehicleNo;
@Schema(description = "司机")
private String driverName;
@Schema(description = "联系电话")
private String driverPhone;
@Schema(description = "押运人")
private String escortName;
@Schema(description = "押运人手机号")
private String escortPhone;
@Schema(description = "承运类型")
private String carrierType;
@Schema(description = "承运商")
private String carrierName;
@Schema(description = "发货地址")
private String departureAddress;
@Schema(description = "途经地")
private String transitAddress;
@Schema(description = "到货地")
private String arrivalAddress;
@Schema(description = "原始单号")
private String originalNo;
@Schema(description = "数据来源")
private String dataSource;
@Schema(description = "开始日期")
private LocalDate startDate;
@Schema(description = "结束日期")
private LocalDate endDate;
@Schema(description = "计划名称")
private String planName;
@Schema(description = "运单批次号")
private String batchNo;
@Schema(description = "当前过程节点")
private String currentProcessNode;
@Schema(description = "里程")
private BigDecimal mileage;
@Schema(description = "预计发货日期")
private LocalDate estimatedStartDate;
@Schema(description = "预计完成日期")
private LocalDate estimatedEndDate;
@Schema(description = "任务备注")
private String taskRemark;
@Schema(description = "货物信息")
private String goodsJson;
@Schema(description = "路线信息")
private String routeJson;
@Schema(description = "任务信息")
private String taskInfoJson;
@Schema(description = "所属组织ID")
private Long deptId;
@Schema(description = "所属组织")
private String deptName;
@Schema(description = "业务状态")
private String businessStatus;
}

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

@@ -29,7 +29,9 @@ import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 运单管理实体类
@@ -72,21 +74,102 @@ public class Waybill extends TenantEntity {
@Schema(description = "货物类型")
private String cargoType;
@Schema(description = "规格")
private String specification;
@Schema(description = "型号")
private String model;
@Schema(description = "数量")
private BigDecimal quantity;
@Schema(description = "数量单位")
private String quantityUnit;
@Schema(description = "发货地址ID")
private Long departureAddressId;
@Schema(description = "发货地")
private String departureName;
@Schema(description = "发货地址")
private String departureAddress;
@Schema(description = "发货联系人")
private String departureContact;
@Schema(description = "发货联系方式")
private String departurePhone;
@Schema(description = "收货地址ID")
private Long arrivalAddressId;
@Schema(description = "收货地")
private String arrivalName;
@Schema(description = "收货地址")
private String arrivalAddress;
@Schema(description = "收货联系人")
private String arrivalContact;
@Schema(description = "收货联系方式")
private String arrivalPhone;
@Schema(description = "任务录入模式")
private String taskEntryMode;
@Schema(description = "承运类型")
private String carrierType;
@Schema(description = "承运商ID")
private Long carrierId;
@Schema(description = "承运商名称")
private String carrierName;
@Schema(description = "司机ID")
private Long driverId;
@Schema(description = "司机姓名")
private String driverName;
@Schema(description = "司机手机号")
private String driverPhone;
@Schema(description = "车/船/航班/班列号")
private String vehicleNo;
@Schema(description = "挂车车牌号")
private String trailerVehicleNo;
@Schema(description = "押运人")
private String escortName;
@Schema(description = "押运人手机号")
private String escortPhone;
@Schema(description = "里程")
private BigDecimal mileage;
@Schema(description = "预计发货时间")
private LocalDateTime estimatedStartTime;
@Schema(description = "预计完成时间")
private LocalDateTime estimatedEndTime;
@Schema(description = "单价")
private BigDecimal unitPrice;
@Schema(description = "计价单位")
private String priceUnit;
@Schema(description = "其他费用合计")
private BigDecimal otherFeeTotal;
@Schema(description = "任务备注")
private String taskRemark;
@Schema(description = "原始单号")
private String originalNo;
@@ -129,6 +212,9 @@ public class Waybill extends TenantEntity {
@Schema(description = "承运信息")
private String carrierJson;
@Schema(description = "任务信息")
private String taskInfoJson;
@Schema(description = "过程节点")
private String processJson;

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

@@ -0,0 +1,69 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
*/
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.LoadingManage;
import java.io.Serial;
import java.time.LocalDate;
/**
* 配载管理视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "配载管理")
public class LoadingManageVO extends LoadingManage {
@Serial
private static final long serialVersionUID = 1L;
@TableField(exist = false)
@Schema(description = "是否查看全部组织")
private Integer allDept;
@TableField(exist = false)
@Schema(description = "是否只读")
private Boolean readonly;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
@TableField(exist = false)
@Schema(description = "业务状态名称")
private String businessStatusName;
@TableField(exist = false)
@Schema(description = "运单号")
private String waybillNo;
@TableField(exist = false)
@Schema(description = "开始日期起")
private LocalDate startDateStart;
@TableField(exist = false)
@Schema(description = "开始日期止")
private LocalDate startDateEnd;
@TableField(exist = false)
@Schema(description = "结束日期起")
private LocalDate endDateStart;
@TableField(exist = false)
@Schema(description = "结束日期止")
private LocalDate endDateEnd;
}

3
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillVO.java
View File

@@ -62,5 +62,8 @@ public class WaybillVO extends Waybill {
@Schema(description = "业务状态名称")
private String businessStatusName;
@TableField(exist = false)
@Schema(description = "是否仅查询未配载运单")
private Integer onlyUnassignedLoading;
}