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

Merge branch 'feature/payment-apply-bfi-sync' into feature/hcs-api-p0

Browse Source 
# Conflicts:
#	blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessBizHandlers.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/task/CustomerKingdeeSyncTask.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/task/PaymentKingdeeResultTask.java
#	doc/nacos/blade.yaml
#	doc/nacos/third-party-api.yaml
This commit is contained in:
刘泉佳
2026-10-15 04:07:13 +08:00
parent fcac12f401 259407c3b9
commit 6fc2cca9ef
556 changed files with 35208 additions and 6751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/jackson/FlexibleLocalDateDeserializer.java
+148
View File
@@ -0,0 +1,148 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.jackson;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.DateTimeException;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* LocalDate 宽松反序列化，对齐 OCR / 司机侧日期归一化规则。
* <p>
* 兼容写法：
* <ul>
* <li>ISO：{@code yyyy-MM-dd}</li>
* <li>紧凑：{@code yyyyMMdd}</li>
* <li>点分 / 斜杠 / 年月日：{@code 2018.3.9}、{@code 2026/03/17}、{@code 2030年05月20日}</li>
* <li>任意非数字分隔：年与月、月与日之间只要不是数字即可</li>
* <li>区间文本：按字段名取起期（first）或止期（last）</li>
* </ul>
*
* @author Chill
*/
public class FlexibleLocalDateDeserializer extends JsonDeserializer<LocalDate> {
/**
* 4 位年 + 1~2 位月 + 1~2 位日，中间允许任意非数字分隔（与 OcrFieldSupport 一致）
*/
private static final Pattern DATE_PATTERN = Pattern.compile("(\\d{4})\\D+(\\d{1,2})\\D+(\\d{1,2})");
private static final Pattern COMPACT_PATTERN = Pattern.compile("(\\d{4})(\\d{2})(\\d{2})");
@Override
public LocalDate deserialize(JsonParser parser, DeserializationContext context) throws IOException {
String text = parser.getValueAsString();
if (text == null) {
return null;
}
String value = text.trim();
if (value.isEmpty()) {
return null;
}
// 「长期」等非日期文案：按空值处理，避免把无法解析的字符串打成 400
if (value.contains("长期") || value.contains("永久")) {
return null;
}
boolean preferLast = isEndDateField(parser.getCurrentName());
LocalDate parsed = parseFlexible(value, preferLast);
if (parsed != null) {
return parsed;
}
return (LocalDate) context.handleWeirdStringValue(LocalDate.class, value,
"期望日期格式 yyyy-MM-dd / yyyyMMdd / yyyy年M月d日 等 OCR 常见写法");
}
/**
* 解析宽松日期文本；区间时按 preferLast 取首段或末段。
*
* @param value 原始文本
* @param preferLast true 取止期，false 取起期
* @return 合法 LocalDate；无法识别时返回 null
*/
public static LocalDate parseFlexible(String value, boolean preferLast) {
if (value == null) {
return null;
}
String text = value.trim();
if (text.isEmpty()) {
return null;
}
List<LocalDate> candidates = matchDates(text);
if (!candidates.isEmpty()) {
return preferLast ? candidates.get(candidates.size() - 1) : candidates.get(0);
}
// 去掉所有非数字后恰为 8 位时按 yyyyMMdd 处理（如 20260317、2026-0317 混杂）
String compact = text.replaceAll("\\D", "");
if (compact.length() == 8) {
return toLocalDate(compact.substring(0, 4), compact.substring(4, 6), compact.substring(6, 8));
}
Matcher compactMatcher = COMPACT_PATTERN.matcher(text);
if (compactMatcher.find()) {
return toLocalDate(compactMatcher.group(1), compactMatcher.group(2), compactMatcher.group(3));
}
return null;
}
private static List<LocalDate> matchDates(String text) {
List<LocalDate> dates = new ArrayList<>();
Matcher matcher = DATE_PATTERN.matcher(text);
while (matcher.find()) {
LocalDate date = toLocalDate(matcher.group(1), matcher.group(2), matcher.group(3));
if (date != null) {
dates.add(date);
}
}
return dates;
}
private static LocalDate toLocalDate(String yearText, String monthText, String dayText) {
try {
int year = Integer.parseInt(yearText);
int month = Integer.parseInt(monthText);
int day = Integer.parseInt(dayText);
return LocalDate.of(year, month, day);
} catch (NumberFormatException | DateTimeException exception) {
return null;
}
}
/**
* 止期字段名通常以 End / EndDate 结尾，区间文本应取最后一段日期。
*/
private static boolean isEndDateField(String fieldName) {
if (fieldName == null || fieldName.isEmpty()) {
return false;
}
return fieldName.endsWith("End") || fieldName.endsWith("EndDate")
|| fieldName.contains("EndDate") || fieldName.contains("ValidEnd");
}
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/ExceptionDisposalFollowRequest.java
+3
View File
@@ -46,4 +46,7 @@ public class ExceptionDisposalFollowRequest implements Serializable {
@Schema(description = "跟进说明")
private String followContent;
@Schema(description = "附件JSON，[{\"name\":\"...\",\"url\":\"...\"}]")
private String attachmentsJson;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/ExceptionDisposalUpdateRequest.java
+63
View File
@@ -0,0 +1,63 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 异常处置编辑请求
* <p>
* 只承载上报四件套。车牌、项目、承运商、配载单号等字段由上报时从运单回填，
* 不在此列，避免编辑后与运单脱钩。
* <p>
* 不含处置状态：状态只能经跟进与完成流转，编辑不得改变它。
*
* @author Chill
*/
@Data
@Schema(description = "异常处置编辑请求")
public class ExceptionDisposalUpdateRequest implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "异常处置ID")
private Long id;
@Schema(description = "异常类型")
private String exceptionType;
@Schema(description = "异常原因")
private String exceptionReason;
@Schema(description = "上报说明")
private String reportDescription;
@Schema(description = "现场照片，逗号分隔")
private String scenePhotos;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/KingdeeInvoicePoolQueryDTO.java
+34 -17
View File
@@ -5,23 +5,22 @@
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* Using this software signifies agreement to the License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package org.springblade.transport.pojo.dto;
@@ -32,12 +31,12 @@ import java.io.Serial;
import java.io.Serializable;
/**
* 金蝶票池实时统一查询条件（收票登记选票与正式结算单认领共用）
* 金蝶票据池镜像统一查询条件（收票登记选票与正式结算单认领共用，查本地镜像）
*
* @author Chill
*/
@Data
@Schema(description = "金蝶票池实时统一查询条件")
@Schema(description = "金蝶票据池镜像统一查询条件")
public class KingdeeInvoicePoolQueryDTO implements Serializable {
@Serial
@@ -73,6 +72,24 @@ public class KingdeeInvoicePoolQueryDTO implements Serializable {
@Schema(description = "开票日期止 yyyy-MM-dd")
private String invoiceDateEnd;
/**
* 开票单位（销方名称），模糊
*/
@Schema(description = "开票单位（销方名称，模糊）")
private String salerName;
/**
* 受票单位（购方名称），模糊
*/
@Schema(description = "受票单位（购方名称，模糊）")
private String buyerName;
/**
* 发票类型编码（票易通字典，如 26/27，镜像按 invoice_type_code 精确匹配）
*/
@Schema(description = "发票类型编码（票易通字典，如 26/27）")
private String invoiceType;
/**
* 销方税号，精确
*/
@@ -86,14 +103,14 @@ public class KingdeeInvoicePoolQueryDTO implements Serializable {
private String buyerTaxNo;
/**
* 发票类型编码（票易通字典，如 26/27）
* 认领过滤：true 仅已认领，false 仅未认领，null 不过滤（已认领=存在非作废正式结算单发票行）
*/
@Schema(description = "发票类型编码（票易通字典，如 26/27）")
private String invoiceType;
@Schema(description = "认领过滤：true已认领/false未认领/null不限")
private Boolean claimed;
/**
* 续扫游标：下一页翻页时原样回传上页返回的 nextCursor，空表示按页码锚定重新扫描
* 登记过滤：true 仅已登记，false 仅未登记，null 不过滤（已登记=存在非作废收票登记）
*/
@Schema(description = "续扫游标（下一页请求回传上页 nextCursor）")
private String cursor;
@Schema(description = "登记过滤：true已登记/false未登记/null不限")
private Boolean registered;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/NodeSubmitDTO.java
+13 -1
View File
@@ -30,7 +30,19 @@ public class NodeSubmitDTO implements Serializable {
@Schema(description = "定位信息")
private Location location;
@Schema(description = "凭证照片 URL 列表")
/**
* 带类型的打卡照片，类型由提交方显式给出；非空时优先于 photos。
*/
@Schema(description = "带类型的照片列表，非空时优先于 photos")
private List<PunchPhotoDTO> photoItems;
/**
* 旧版小程序提交的裸 URL 列表，类型只能按下标回推过程配置的凭证类型。
* <p>
* 与 photoItems 并存是为了不强制升级小程序：新版提交 photoItems，旧版仍走这里；
* 等旧版本覆盖率达标后由后续改造删除。
*/
@Schema(description = "凭证照片 URL 列表，类型按下标回推")
private List<String> photos;
@Schema(description = "重量（吨）")
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/KingdeeInvoicePoolPageVO.java → blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/OcrRecognizeRequest.java
+10 -23
View File
@@ -23,44 +23,31 @@
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.vo;
package org.springblade.transport.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 金蝶票池实时查询游标分页返回体（A801-1 无总数：hasMore 驱动上一页/下一页）
* 证件 OCR 识别请求（小程序）
*
* @author Chill
*/
@Data
@Schema(description = "金蝶票池游标分页返回体")
public class KingdeeInvoicePoolPageVO implements Serializable {
@Schema(description = "证件OCR识别请求")
public class OcrRecognizeRequest implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/** 本页数据（金蝶实时行 + 本地认领/登记装饰标记） */
@Schema(description = "本页数据")
private List<KingdeeInvoicePoolVO> records;
@Schema(description = "已上传图片的地址，必须是百度可访问的HTTP或HTTPS地址")
private String imageUrl;
@Schema(description = "证件类型：idcard-身份证，driver-驾驶证，vehicle-行驶证，road_transport-道路运输证")
private String type;
@Schema(description = "正副面：front或back，默认front")
private String side;
/** 当前页码，从 1 开始 */
@Schema(description = "当前页码")
private Long current;
/** 每页条数 */
@Schema(description = "每页条数")
private Long size;
/** 是否还有下一页（服务端有界补页扫描判断） */
@Schema(description = "是否还有下一页")
private Boolean hasMore;
/** 下一页续扫游标（"远程页码:已消费过滤行数"），null 表示没有更多；翻下一页时原样回传 */
@Schema(description = "下一页续扫游标，null 表示没有更多")
private String nextCursor;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/PersonCertSubmitRequest.java
+98
View File
@@ -0,0 +1,98 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
/**
* 司机端个人认证提交请求
* <p>
* 一次提交承载个人认证的**全部**内容（身份证 + 驾驶证 + 从业资格证），
* 三证一起提交、一起审核，不拆开。
*
* @author Chill
*/
@Data
@Schema(description = "司机端个人认证提交请求")
public class PersonCertSubmitRequest implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "真实姓名")
private String realName;
@Schema(description = "身份证号")
private String idCardNo;
@Schema(description = "身份证正面照")
private String idCardFrontUrl;
@Schema(description = "身份证反面照")
private String idCardBackUrl;
@Schema(description = "身份证有效期起")
private LocalDate idCardValidStart;
@Schema(description = "身份证有效期止")
private LocalDate idCardValidEnd;
@Schema(description = "身份证长期有效")
private Integer idCardLongTerm;
@Schema(description = "驾驶证档案编号")
private String driverFileNo;
@Schema(description = "准驾车型")
private String driverClass;
@Schema(description = "驾驶证主页照片")
private String driverLicenseFrontUrl;
@Schema(description = "驾驶证副页照片")
private String driverLicenseBackUrl;
@Schema(description = "驾驶证有效期起")
private LocalDate driverValidStart;
@Schema(description = "驾驶证有效期止")
private LocalDate driverValidEnd;
@Schema(description = "驾驶证长期有效")
private Integer driverLongTerm;
@Schema(description = "从业资格证类型")
private String qualificationType;
@Schema(description = "从业资格证号")
private String qualificationNo;
@Schema(description = "从业资格证封面页")
private String qualificationFront;
@Schema(description = "从业资格证内容页")
private String qualificationBack;
@Schema(description = "从业资格证有效期起")
private LocalDate qualificationValidStart;
@Schema(description = "从业资格证有效期止")
private LocalDate qualificationValidEnd;
@Schema(description = "从业资格证长期有效")
private Integer qualificationLongTerm;
@Schema(description = "大头照")
private String headPhoto;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/PunchPhotoDTO.java
+32
View File
@@ -0,0 +1,32 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
*/
package org.springblade.transport.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 带类型的打卡照片
* <p>
* 类型取值域是固定的「打卡照片」加该节点过程配置勾选的凭证类型，域外类型一律拒绝：
* 类型是照片分组的唯一依据，放进来路不明的类型会让回显分组错乱。
*/
@Data
@Schema(description = "带类型的打卡照片")
public class PunchPhotoDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "照片类型")
private String type;
@Schema(description = "图片URL")
private String url;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/ReceiptClaimPushResult.java
+70
View File
@@ -0,0 +1,70 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for their own commercial purposes.
* <p>
* Using this software signifies agreement to this license agreement and terms of use,
* and you expressly agree to be bound by the terms of use of this software.
* <p>
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 收款认领推送金蝶结果（A301-3）
* <p>
* 推送失败不抛异常跨事务边界（保证失败状态落库不被回滚），以本结果对象向调用方报告成败与原因。
*
* @author Chill
*/
@Data
@Schema(description = "收款认领推送金蝶结果")
public class ReceiptClaimPushResult implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "是否推送成功")
private boolean success;
@Schema(description = "金蝶收款单号（成功时返回，可能为空：金蝶响应未返回单号）")
private String kingdeeBillNo;
@Schema(description = "失败原因（成功时为空）")
private String message;
public static ReceiptClaimPushResult success(String kingdeeBillNo) {
ReceiptClaimPushResult result = new ReceiptClaimPushResult();
result.setSuccess(true);
result.setKingdeeBillNo(kingdeeBillNo);
return result;
}
public static ReceiptClaimPushResult fail(String message) {
ReceiptClaimPushResult result = new ReceiptClaimPushResult();
result.setSuccess(false);
result.setMessage(message);
return result;
}
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/VehicleCertSubmitRequest.java
+115
View File
@@ -0,0 +1,115 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
/**
* 司机端车辆认证提交请求
* <p>
* 一次提交承载该车辆认证的**全部**内容（行驶证 + 道路运输证），两证一起提交、一起审核。
* 提交只产生新的待审记录，不覆盖车辆当前已生效的认证内容。
*
* @author Chill
*/
@Data
@Schema(description = "司机端车辆认证提交请求")
public class VehicleCertSubmitRequest implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "车辆ID：新增时为空，重新认证时必填")
private Long id;
@Schema(description = "车牌号")
private String plateNo;
@Schema(description = "所有人：行驶证登记的单位名称，不是司机")
private String ownerName;
@Schema(description = "车牌颜色")
private String plateColor;
@Schema(description = "车辆类型")
private String vehicleType;
@Schema(description = "车辆识别代号（车架号），选填")
private String vin;
@Schema(description = "外廓长度，毫米")
private Integer outerLength;
@Schema(description = "外廓宽度，毫米")
private Integer outerWidth;
@Schema(description = "外廓高度，毫米")
private Integer outerHeight;
@Schema(description = "核定载质量，KG")
private Integer approvedLoadKg;
@Schema(description = "准牵引总质量，KG")
private Integer tractionMassKg;
@Schema(description = "能源类型")
private String energyType;
@Schema(description = "业务关系：自有 / 管理挂靠 / 业务合作")
private String businessRelation;
@Schema(description = "强制报废日期")
private LocalDate compulsoryScrapDate;
@Schema(description = "强制报废长期有效：0否 1是")
private Integer compulsoryScrapLongTerm;
@Schema(description = "行驶证档案编号")
private String drivingLicenseNo;
@Schema(description = "行驶证主页正面照片")
private String drivingLicenseImage;
@Schema(description = "行驶证主页反面照片")
private String drivingLicenseMainBack;
@Schema(description = "行驶证副页正面照片")
private String drivingLicenseViceFront;
@Schema(description = "行驶证副页反面照片")
private String drivingLicenseViceBack;
@Schema(description = "行驶证有效期起")
private LocalDate drivingLicenseStartDate;
@Schema(description = "行驶证有效期止")
private LocalDate drivingLicenseEndDate;
@Schema(description = "行驶证长期有效：0否 1是")
private Integer drivingLicenseLongTerm;
@Schema(description = "道路运输证号")
private String roadTransportCertNo;
@Schema(description = "道路运输证照片")
private String roadTransportCertImage;
@Schema(description = "道路运输证有效期起")
private LocalDate roadTransportCertStartDate;
@Schema(description = "道路运输证有效期止")
private LocalDate roadTransportCertEndDate;
@Schema(description = "道路运输证长期有效：0否 1是")
private Integer roadTransportCertLongTerm;
@Schema(description = "机动车登记编号")
private String registrationNo;
@Schema(description = "机动车登记本照片")
private String registrationImage;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/WaybillImportBatchRequest.java
+8
View File
@@ -32,5 +32,13 @@ public class WaybillImportBatchRequest {
private Long planId;
private String planName;
private String remark;
/** 列表筛选：创建人 */
private Long createUser;
/** 列表筛选：创建时间起（yyyy-MM-dd HH:mm:ss） */
private String createTimeStart;
/** 列表筛选：创建时间止（yyyy-MM-dd HH:mm:ss） */
private String createTimeEnd;
private List<Map<String, Object>> rows;
/** 分批确认导入时，是否追加到已有批次（首批为 false，后续批为 true）。 */
private Boolean append;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/WaybillPunchRecordSaveRequest.java
+114
View File
@@ -0,0 +1,114 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* 管理端打卡记录编辑请求
* <p>
* 承载时间轴上单条打卡记录的全部可编辑项，字段按过程配置取舍：
* 打卡定位（地址/经纬度）、上传货量（重量/体积/数量）、上传凭证（照片）。
* <p>
* {@code punched=false} 表示取消打卡，服务端会清除该节点的打卡流水
* ——时间轴上「未打卡」的判据就是没有流水，故不能只改状态位。
*
* @author Chill
*/
@Data
@Schema(description = "管理端打卡记录编辑请求")
public class WaybillPunchRecordSaveRequest implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "运单ID")
private Long waybillId;
@Schema(description = "打卡类型：node=过程节点打卡，enroute=在途打卡")
private String type;
@Schema(description = "过程节点 key")
private String nodeCode;
@Schema(description = "过程节点名称")
private String nodeName;
@Schema(description = "打卡状态：true 已打卡，false 未打卡")
private Boolean punched;
@Schema(description = "打卡时间 yyyy-MM-dd HH:mm:ss，为空时取当前时间")
private String punchTime;
@Schema(description = "打卡地址")
private String address;
@Schema(description = "经度")
private String longitude;
@Schema(description = "纬度")
private String latitude;
@Schema(description = "重量（吨）")
private String weight;
@Schema(description = "体积（方）")
private String volume;
@Schema(description = "数量（件）")
private String quantity;
@Schema(description = "备注")
private String remark;
@Schema(description = "打卡凭证图，按上传顺序回写凭证类型")
private List<Photo> photos = new ArrayList<>();
/**
* 打卡凭证图
* <p>
* 类型随图一起回写：展示层对「逗号分隔的裸 URL」按凭证类型下标回推标签，
* 编辑换了顺序就会串标，所以这里保留原类型。
*/
@Data
@Schema(description = "打卡凭证图")
public static class Photo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "凭证类型")
private String type;
@Schema(description = "图片URL")
private String url;
}
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java
+10 -3
View File
@@ -61,10 +61,10 @@ public class ContractManage extends TenantEntity {
@Schema(description = "所属项目")
private String projectName;
@Schema(description = "所属组织ID")
@Schema(description = "合同负责部门ID")
private Long organizationId;
@Schema(description = "所属组织")
@Schema(description = "合同负责部门")
private String organizationName;
@Schema(description = "合同类别")
@@ -100,6 +100,9 @@ public class ContractManage extends TenantEntity {
@Schema(description = "签订日期")
private LocalDate signDate;
@Schema(description = "申请日期（提交正式合同时写入）")
private LocalDate applyDate;
@Schema(description = "结算方式")
private String settlementMode;
@@ -107,6 +110,7 @@ public class ContractManage extends TenantEntity {
private String contractFormat;
@Schema(description = "是否需要加盖法人章")
@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
private Integer legalSealFlag;
@Schema(description = "一式份数")
@@ -206,7 +210,10 @@ public class ContractManage extends TenantEntity {
@Schema(description = "终止原因")
private String terminateReason;
@Schema(description = "备注")
@Schema(description = "合同主要内容")
private String mainContent;
@Schema(description = "其他事项说明")
private String remark;
@Schema(description = "合规系统单据ID（fdContractId）")
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/Driver.java
+56 -2
View File
@@ -28,10 +28,15 @@ package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springblade.transport.jackson.FlexibleLocalDateDeserializer;
import java.io.Serial;
import java.time.LocalDate;
@@ -64,6 +69,7 @@ public class Driver extends TenantEntity {
* 出生年月
*/
@Schema(description = "出生年月")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate birthday;
/**
* 性别
@@ -111,6 +117,23 @@ public class Driver extends TenantEntity {
*/
@Schema(description = "身份证反面照")
private String idCardBack;
/**
* 身份证有效期起
*/
@Schema(description = "身份证有效期起")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate idCardValidStart;
/**
* 身份证有效期止
*/
@Schema(description = "身份证有效期止")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate idCardValidEnd;
/**
* 身份证长期有效
*/
@Schema(description = "身份证长期有效")
private Integer idCardLongTerm;
/**
* 大头照
*/
@@ -130,11 +153,13 @@ public class Driver extends TenantEntity {
* 驾驶证有效期起
*/
@Schema(description = "驾驶证有效期起")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate drivingLicenseStartDate;
/**
* 驾驶证有效期止
*/
@Schema(description = "驾驶证有效期止")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate drivingLicenseEndDate;
/**
* 驾驶证长期有效
@@ -165,6 +190,7 @@ public class Driver extends TenantEntity {
* 从业资格证有效期止
*/
@Schema(description = "从业资格证有效期止")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate qualificationEndDate;
/**
* 从业资格证长期有效
@@ -192,9 +218,10 @@ public class Driver extends TenantEntity {
@Schema(description = "手机号")
private String mobile;
/**
* 关联系统用户ID
* 关联小程序用户ID（blade_mp_user.id）
*/
@Schema(description = "关联系统用户ID")
@Schema(description = "关联小程序用户ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 与联系人关系
@@ -221,5 +248,32 @@ public class Driver extends TenantEntity {
*/
@Schema(description = "备注")
private String remark;
/**
* 最新提交状态展示缓存：0审核中 1已通过 2已驳回 3已作废，null 表示从未提交
* <p>
* 仅为列表展示而冗余，<b>不是</b>可用性判据；「是否已认证」一律读生效快照指针。
*/
@Schema(description = "最新提交状态展示缓存：0审核中 1已通过 2已驳回 3已作废，null为从未提交")
private Integer certificationStatus;
/**
* 最新一次驳回原因展示缓存
*/
@Schema(description = "最新一次驳回原因展示缓存")
private String certificationRejectReason;
/**
* 生效快照指针：指向 blade_transport_cert_record.id
* <p>
* 「该司机是否已认证」的<b>唯一</b>判据。为 null 表示从未认证通过；
* 一经设置<b>永不回退</b>——提交、驳回、作废都不得修改它，
* 因此重新提交认证不会让一个已认证的司机失去接单资格。
* <p>
* ⚠️ {@code READ_ONLY}：本字段<b>只能由审核通过时</b>写入。
* 司机档案的 {@code /submit} 直接以本实体接收请求体，若允许反序列化，
* 调用方就能自行填一个记录 ID 把自己「认证」掉，绕过审核。
*/
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonSerialize(using = ToStringSerializer.class)
@Schema(description = "生效快照指针")
private Long effectiveCertRecordId;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ExceptionDisposal.java
+6
View File
@@ -51,6 +51,12 @@ public class ExceptionDisposal extends TenantEntity {
@Schema(description = "运单号")
private String waybillNo;
@Schema(description = "过程节点 key（为空表示未指明节点）")
private String nodeCode;
@Schema(description = "过程节点名称（上报时复制，此后不随过程配置变化）")
private String nodeName;
@Schema(description = "配载单号/总单号")
private String loadingOrMasterNo;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ExceptionDisposalFollowRecord.java
+3
View File
@@ -51,6 +51,9 @@ public class ExceptionDisposalFollowRecord extends TenantEntity {
@Schema(description = "跟进说明")
private String followContent;
@Schema(description = "附件JSON")
private String attachmentsJson;
@Schema(description = "跟进人")
private Long followUser;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlement.java
+4
View File
@@ -144,6 +144,10 @@ public class FormalSettlement extends TenantEntity {
* 金蝶单据编号
*/
private String kingdeeBillNo;
/**
* 金蝶单据id（星瀚内部主键，A902 附件上传定位用）
*/
private String kingdeeBillId;
/**
* 金蝶同步状态：unsynced-未同步 synced-已同步 failed-同步失败
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceApplication.java
+4
View File
@@ -159,6 +159,10 @@ public class InvoiceApplication extends TenantEntity {
* 金蝶开票申请单编号（A303-1 返回，A303-5 查询 serialNo）
*/
private String kingdeeBillNo;
/**
* 金蝶开票申请单id（星瀚内部主键，A902 附件上传定位用）
*/
private String kingdeeBillId;
/**
* 金蝶同步状态：unsynced-未同步 synced-已同步 failed-同步失败 invoiced-开票完成（终态）
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceApplicationInvoice.java
+13
View File
@@ -33,6 +33,7 @@ import java.time.LocalDateTime;
* 开票申请金蝶发票结果实体类
* <p>
* 定时任务经 A303-5 开票申请发票查询回写的发票明细（发票号唯一键幂等落库），
* 发票文件地址（板式文件/数电PDF/XML/预览图）独立落库供详情页查看下载，
* 原文 JSON 整体留档便于联调与追溯
*
* @author Chill
@@ -61,6 +62,18 @@ public class InvoiceApplicationInvoice extends TenantEntity {
@Schema(description = "价税合计")
private BigDecimal invoiceAmount;
@Schema(description = "板式文件下载地址（数电票为OFD，航信百望税盘普通电票为PDF，电子专票/UKey电票为OFD）")
private String invoiceFileUrl;
@Schema(description = "PDF图片预览地址")
private String invoiceImageUrl;
@Schema(description = "数电PDF下载地址（发票云5.0.025版本返回）")
private String invoicePdfFileUrl;
@Schema(description = "数电XML下载地址（发票云5.0.025版本返回）")
private String invoiceXmlFileUrl;
@Schema(description = "A303-5 返回原文JSON留档")
private String rawJson;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceReceipt.java
+4
View File
@@ -152,6 +152,10 @@ public class InvoiceReceipt extends TenantEntity {
* 金蝶收票单单据编号（A303-2 批量保存生成/幂等预检命中回填）
*/
private String kingdeeReceivedInvoiceNo;
/**
* 金蝶收票单id（星瀚内部主键，A902 附件上传定位用）
*/
private String kingdeeReceivedInvoiceId;
/**
* 收票单推送状态（unsynced 未推送 / pushed 已保存收票单 / assigned 已指定应付 / failed 推送失败）
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeAttachmentSync.java
+84
View File
@@ -0,0 +1,84 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.LocalDateTime;
/**
* 金蝶附件同步实体类（A902 附件上传到指定单据，单附件行级状态）
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_kingdee_attachment_sync")
@Schema(description = "金蝶附件同步")
public class KingdeeAttachmentSync extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 业务单据类型（pay_application/formal_settlement_ap/formal_settlement_ar/invoice_receipt/invoice_application）
*/
private String bizType;
/**
* 业务单据id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long bizId;
/**
* 附件幂等键（用户附件=附件url；发票文件=A801-2 的 path）
*/
private String attachmentKey;
/**
* 附件名称（展示/排查用）
*/
private String attachmentName;
/**
* 金蝶侧文件路径（A902 返回 data.path）
*/
private String kingdeePath;
/**
* 同步状态：1 成功 / 0 失败
*/
private Integer syncStatus;
/**
* 失败原因（超限/下载失败/金蝶报错）
*/
private String failReason;
/**
* 最近上传时间
*/
private LocalDateTime syncTime;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeBillLock.java
+87
View File
@@ -0,0 +1,87 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement obtained after purchasing a license from BladeX.
* <p>
* 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.LocalDateTime;
/**
* 金蝶单据锁定记录实体类
* <p>
* 一行 = 一张金蝶目标单：推送成功后 lockBusiData 锁定（FAILED→LOCKED），金蝶经 unLockNotifyBusiData
* 回调解锁（→UNLOCKED，DELETE 时废除源单并还原关联数据）；同时承担当前锁状态（编辑守卫/回调定位）
* 与锁定补偿扫表（FAILED+try_count）、锁定/解锁留痕
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_kingdee_bill_lock")
@Schema(description = "金蝶单据锁定记录")
public class KingdeeBillLock extends TenantEntity {
@Serial private static final long serialVersionUID = 1L;
/**
* WLTMS 单据类型（SETTLEMENT/INVOICE_APPLY，预留 PAY_APPLY/RECEIVED_INVOICE）
*/
private String sourceBillType;
/**
* WLTMS 业务主键
*/
private Long sourceBillId;
/**
* WLTMS 单号（正式结算单号/开票申请单号）
*/
private String sourceBillNo;
/**
* 金蝶单据类型（ApFin_other_BT_S/arfin_other_BT_S/cdm_paybill_bank_elect_BT_S 等固定值）
*/
private String targetBillType;
/**
* 金蝶单据编号（即业务单 kingdeeBillNo，开票申请按发票张次逐张一行）
*/
private String targetBillNo;
/**
* 锁状态：failed-锁定失败（补偿重试对象）/locked-金蝶锁定中/unlocked-已解锁（终态）
*/
private String lockStatus;
/**
* 最近动作来源操作类型：SAVE-单据新增，DELETE-单据删除（DELETE 回调触发废除还原）
*/
private String operationType;
/**
* 锁定重试次数（补偿任务用，超上限停试）
*/
private Integer tryCount;
/**
* 锁定时间
*/
private LocalDateTime lockTime;
/**
* 解锁时间
*/
private LocalDateTime unlockTime;
/**
* 推单发起人（锁定操作人）
*/
private String lockOperator;
/**
* 回调操作人（金蝶侧操作人）
*/
private String notifyOperator;
/**
* 锁定失败原因
*/
private String failReason;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeInvoicePool.java
+8
View File
@@ -143,4 +143,12 @@ public class KingdeeInvoicePool extends TenantEntity {
* 票池数据更新时间（A801-1 billCreateTime，镜像排序字段）
*/
private LocalDateTime sourceUpdatedTime;
/**
* 剩余可用金额（A801-1 availableAmount，金蝶可用税额口径，选票本地过滤用：>0 才可选）
*/
private BigDecimal availableAmount;
/**
* 金额使用状态（A801-1 amountUseStatus，0 未使用可选 / 2 全部使用；选票本地过滤用）
*/
private String amountUseStatus;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java
+60
View File
@@ -80,16 +80,76 @@ public class KingdeeReceiptFlow extends TenantEntity {
* 收款人（A301-2 recpayee）
*/
private String payeeName;
/**
* 收款通知单号（A301-2 billno）
*/
private String receiptNoticeNo;
/**
* 付款人名称（A301-2 recviewpayer）
*/
private String payerName;
/**
* 收款金额（A301-2 reamount）
*/
private BigDecimal receiptAmount;
/**
* 对方单位名称（A301-2 oppunit）
*/
private String counterpartyName;
/**
* 对方银行账号（A301-2 oppbanknumber）
*/
private String counterpartyAccount;
/**
* 对方开户行（A301-2 oppbank）
*/
private String counterpartyBank;
/**
* 摘要（A301-2 description）
*/
private String summary;
/**
* 交易日期（A301-2 tradetime）
*/
private LocalDateTime transactionTime;
/**
* 明细流水号（A301-2 detailid，回退 tradedetailno / bankdetailno，幂等键）
*/
private String detailSerialNo;
/**
* 已认领金额（本地认领驱动，初始为0）
*/
private BigDecimal claimedAmount;
/**
* 认领状态（unclaimed未认领/partial部分认领/claimed认领完成，累计认领与公告未认领金额对表）
*/
private String claimStatus;
/**
* 推送状态（none未推送/pushed已推送/failed推送失败；已推送为终态闸门，不允许二次推送）
*/
private String pushStatus;
/**
* 最近一次推送失败原因（成功后清空）
*/
private String pushFailReason;
/**
* 首次推送金蝶成功时间
*/
private LocalDateTime pushedTime;
/**
* 金蝶推送来源单据编码（分摊结算单号下划线拼接，推送时生成落库；分摊不变则重试编码不变，A301-1 回写匹配键）
*/
private String awrpSrcCode;
/**
* 金蝶收款单号（推送响应回填 / A301-1 回写推进）
*/
private String kingdeeBillNo;
/**
* 金蝶回写状态（none未推送/pushed已推送/approved审核通过/received已收款/failed失败）
*/
private String kingdeeBillStatus;
/**
* 来源更新时间（取交易日期，同步时刷新）
*/
private LocalDateTime sourceUpdatedTime;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/LoadingManage.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class LoadingManage extends TenantEntity {
@Schema(description = "货物名称")
private String cargoName;
@Schema(description = "车/船/航班/班列")
@Schema(description = "车牌号/船班号/船次号/班次号")
private String vehicleNo;
@Schema(description = "挂车车牌号")
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ProjectApply.java
+3 -3
View File
@@ -70,10 +70,10 @@ public class ProjectApply extends TenantEntity {
@Schema(description = "业务部门")
private String businessDeptName;
@Schema(description = "承办部门ID")
private Long undertakeDeptId;
@Schema(description = "平台公司ID，多个逗号分隔")
private String undertakeDeptId;
@Schema(description = "承办部门")
@Schema(description = "平台公司，多个顿号分隔")
private String undertakeDeptName;
@Schema(description = "项目由来")
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ReceiptClaim.java
+4 -2
View File
@@ -66,10 +66,12 @@ public class ReceiptClaim extends TenantEntity {
private String remark;
private String claimStatus;
/**
* 金蝶认领结果推送来源单据编码（A301-3 awrp_src_code，A301-1 回写按此匹配）
* 金蝶收款单号（冗余展示：推送成功/A301-1 回写时由流水级联刷新）
*/
private String awrpSrcCode;
private String kingdeeBillNo;
/**
* 金蝶回写状态（冗余展示：与流水 kingdee_bill_status 同步刷新）
*/
private String kingdeeBillStatus;
@JsonSerialize(using = ToStringSerializer.class)
private Long voidedBy;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportCertRecord.java
+158
View File
@@ -0,0 +1,158 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.LocalDateTime;
/**
* 认证记录实体类
* <p>
* 认证对象（司机 / 车辆）<b>每一次提交</b>所产生的、<b>不可变</b>的快照。
* 记录一经创建，其 {@code snapshotJson} 与提交元信息永不修改；被同对象的后续提交取代时
* 标记为「已作废」，而<b>不是</b>删除。判定某个对象「是否已认证」只看它持有的生效快照指针，
* 与记录表里的任何一条记录的状态都无关。
* <p>
* ⚠️ <b>{@code status} 承载的是「审核状态」，不是 BladeX 的「启用 / 停用」。</b>
* 该字段继承自 {@link TenantEntity}，带来两条必须堵住的框架通道：
* 一是 {@code BaseServiceImpl#resolveEntity} 在插入时会把 {@code null} 的 {@code status}
* <b>静默填成 {@code 1}</b>（恰好是 {@link #STATUS_APPROVED}）；
* 二是继承来的 {@code changeStatus(ids, 1)} 会直接写 {@code status}，等于批量通过审核。
* 二者都已在 {@code TransportCertRecordServiceImpl} 中封堵（前者校验抛错、后者覆写抛错）。
* 审核必须逐条、带审核人与审核时间落库，不得借道 {@code changeStatus} 批量改状态。
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_transport_cert_record")
@Schema(description = "认证记录")
public class TransportCertRecord extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 认证对象类型：司机
*/
public static final String BIZ_TYPE_DRIVER = "driver";
/**
* 认证对象类型：车辆
*/
public static final String BIZ_TYPE_VEHICLE = "vehicle";
/**
* 审核状态：审核中（即该对象的「待审快照」）
*/
public static final Integer STATUS_PENDING = 0;
/**
* 审核状态：已通过（该对象最新一条已通过者即其「生效快照」）
*/
public static final Integer STATUS_APPROVED = 1;
/**
* 审核状态：已驳回（审核的否定结论，需带驳回原因）
*/
public static final Integer STATUS_REJECTED = 2;
/**
* 审核状态：已作废（被同对象的再次提交取代，非驳回）
*/
public static final Integer STATUS_SUPERSEDED = 3;
/**
* 驳回原因最大长度，与 {@code reject_reason} 列宽保持一致
*/
public static final int REJECT_REASON_MAX_LENGTH = 200;
/**
* 认证对象类型：driver-司机，vehicle-车辆
* <p>
* {@code NEVER}：记录一经创建，认证对象的身份不可改。
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@Schema(description = "认证对象类型：driver-司机，vehicle-车辆")
private String bizType;
/**
* 认证对象主键：司机ID 或 车辆ID（车辆按具体车辆，不是司机）
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@JsonSerialize(using = ToStringSerializer.class)
@Schema(description = "认证对象主键")
private Long bizId;
/**
* 展示键：司机姓名 / 车牌号，供审核列表直接展示
*/
@Schema(description = "展示键：司机姓名 / 车牌号")
private String bizKey;
/**
* 该次提交的全量认证内容（JSON），一经创建不可修改
* <p>
* {@code NEVER}：本字段<b>永不进入 UPDATE 语句</b>，因此不存在「某条链路
* 忘了保护快照」的可能。改内容只能靠<b>新提交一条记录</b>。
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@Schema(description = "该次提交的全量认证内容JSON")
private String snapshotJson;
/**
* 驳回原因，仅当审核状态为已驳回时有值
*/
@Schema(description = "驳回原因")
private String rejectReason;
/**
* 提交时间
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@Schema(description = "提交时间")
private LocalDateTime submitTime;
/**
* 提交人
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@JsonSerialize(using = ToStringSerializer.class)
@Schema(description = "提交人")
private Long submitUser;
/**
* 审核时间
*/
@Schema(description = "审核时间")
private LocalDateTime auditTime;
/**
* 审核人
*/
@JsonSerialize(using = ToStringSerializer.class)
@Schema(description = "审核人")
private Long auditUser;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportVehicle.java
+38
View File
@@ -26,10 +26,15 @@
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springblade.transport.jackson.FlexibleLocalDateDeserializer;
import java.io.Serial;
import java.time.LocalDate;
@@ -63,6 +68,11 @@ public class TransportVehicle extends TenantEntity {
*/
@Schema(description = "车牌号")
private String plateNo;
/**
* 所有人：行驶证登记的单位名称，不是司机
*/
@Schema(description = "所有人（行驶证登记的单位名称，不是司机）")
private String ownerName;
/**
* 车牌颜色
*/
@@ -73,6 +83,11 @@ public class TransportVehicle extends TenantEntity {
*/
@Schema(description = "车辆类型")
private String vehicleType;
/**
* 车辆识别代号（车架号）
*/
@Schema(description = "车辆识别代号（车架号）")
private String vin;
/**
* 外廓长度，毫米
*/
@@ -112,6 +127,7 @@ public class TransportVehicle extends TenantEntity {
* 强制报废日期
*/
@Schema(description = "强制报废日期")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate compulsoryScrapDate;
/**
* 强制报废长期有效
@@ -132,11 +148,13 @@ public class TransportVehicle extends TenantEntity {
* 行驶证有效期起
*/
@Schema(description = "行驶证有效期起")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate drivingLicenseStartDate;
/**
* 行驶证有效期止
*/
@Schema(description = "行驶证有效期止")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate drivingLicenseEndDate;
/**
* 行驶证长期有效
@@ -172,11 +190,13 @@ public class TransportVehicle extends TenantEntity {
* 道路运输证有效期起
*/
@Schema(description = "道路运输证有效期起")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate roadTransportCertStartDate;
/**
* 道路运输证有效期止
*/
@Schema(description = "道路运输证有效期止")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate roadTransportCertEndDate;
/**
* 道路运输证长期有效
@@ -192,6 +212,7 @@ public class TransportVehicle extends TenantEntity {
* 道路运输年审有效期
*/
@Schema(description = "道路运输年审有效期")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate annualReviewEndDate;
/**
* 道路运输年审长期有效
@@ -207,6 +228,7 @@ public class TransportVehicle extends TenantEntity {
* 机动车登记日期
*/
@Schema(description = "机动车登记日期")
@JsonDeserialize(using = FlexibleLocalDateDeserializer.class)
private LocalDate registrationDate;
/**
* 机动车登记本图片
@@ -224,5 +246,21 @@ public class TransportVehicle extends TenantEntity {
/** 认证驳回原因 */
@Schema(description = "认证驳回原因")
private String certificationRejectReason;
/**
* 生效快照指针：指向 blade_transport_cert_record.id
* <p>
* 「该车辆是否已认证」的<b>唯一</b>判据。为 null 表示从未认证通过；
* 一经设置<b>永不回退</b>——重新提交、待审、被驳回都不得修改它，
* 因此重新提交认证不会让一辆已认证的车掉出可用池。
* {@link #certificationStatus} 是「最新提交状态」的展示缓存，不代表是否已认证。
* <p>
* ⚠️ {@code READ_ONLY}：本字段<b>只能由审核通过时</b>写入。
* {@code POST /transport-vehicle/submit} 直接以本实体接收请求体，
* 若允许反序列化，调用方就能自行填一个记录 ID 把自己「认证」掉，绕过审核。
*/
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonSerialize(using = ToStringSerializer.class)
@Schema(description = "生效快照指针")
private Long effectiveCertRecordId;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/Waybill.java
+10 -1
View File
@@ -25,6 +25,8 @@ package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -82,6 +84,7 @@ public class Waybill extends TenantEntity {
@Schema(description = "型号")
private String model;
@JsonSerialize(nullsUsing = NullSerializer.class)
@Schema(description = "数量")
private BigDecimal quantity;
@@ -162,7 +165,7 @@ public class Waybill extends TenantEntity {
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private String driverRejectReason;
@Schema(description = "车/船/航班/班列号")
@Schema(description = "车牌号/船班号/船次号/班次号")
private String vehicleNo;
@Schema(description = "船长")
@@ -183,6 +186,7 @@ public class Waybill extends TenantEntity {
@Schema(description = "押运人手机号")
private String escortPhone;
@JsonSerialize(nullsUsing = NullSerializer.class)
@Schema(description = "里程")
private BigDecimal mileage;
@@ -195,12 +199,14 @@ public class Waybill extends TenantEntity {
@Schema(description = "预计完成日期")
private LocalDate estimatedEndTime;
@JsonSerialize(nullsUsing = NullSerializer.class)
@Schema(description = "单价")
private BigDecimal unitPrice;
@Schema(description = "计价单位")
private String priceUnit;
@JsonSerialize(nullsUsing = NullSerializer.class)
@Schema(description = "其他费用合计")
private BigDecimal otherFeeTotal;
@@ -234,6 +240,9 @@ public class Waybill extends TenantEntity {
@Schema(description = "配载单号")
private String loadingNo;
@Schema(description = "配载标识号")
private String loadingIdentifier;
@Schema(description = "运单批次号")
private String batchNo;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AccidentRecordVO.java
+7
View File
@@ -80,6 +80,13 @@ public class AccidentRecordVO extends AccidentRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
/**
* 创建人姓名
*/
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
/**
* 更新人姓名
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java
+3
View File
@@ -44,4 +44,7 @@ public class AdminHomeBadgesVO implements Serializable {
@Schema(description = "风险记录待办数（disposalStatus=pending）")
private long risk;
@Schema(description = "重新派单待办数（司机已拒单且运单未取消未完成）")
private long pendingReassign;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeVO.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class AdminHomeVO implements Serializable {
@Schema(description = "快捷入口角标")
private AdminHomeBadgesVO badges = new AdminHomeBadgesVO();
@Schema(description = "待处理事项（异常处置状态≠已完成）")
@Schema(description = "待处理事项（异常处置状态≠已完成，或司机已拒单待重新派单）")
private List<AdminTodoItemVO> feed = new ArrayList<>();
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AnnualInspectionRecordVO.java
+4
View File
@@ -68,6 +68,10 @@ public class AnnualInspectionRecordVO extends AnnualInspectionRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/BaiduOcrResultVO.java
+10
View File
@@ -56,4 +56,14 @@ public class BaiduOcrResultVO implements Serializable {
@Schema(description = "百度OCR原始返回结果")
private Map<String, Object> result;
/**
* 归一化后的业务字段
* <p>
* 键与提交请求里的字段同名（{@code plateNo}、{@code ownerName}…），调用方直接回填即可，
* 不需要认识百度那套中文键名。只包含**识别到**的字段，没识别到的不出现（而不是给空串），
* 调用方据此就能区分「没识别到」与「识别到空值」，不会把用户已填的内容覆盖成空。
*/
@Schema(description = "归一化后的业务字段，键与提交请求同名")
private Map<String, Object> fields;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CertAuditDetailVO.java
+97
View File
@@ -0,0 +1,97 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* 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 java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 认证审核详情视图
* <p>
* 审核是「拿新提交的内容和当前生效的内容比」的过程，所以这里**同时**给出两侧：
* {@code pendingSnapshotJson} 是本次待审的全量内容，
* {@code effectiveSnapshotJson} 是该对象当前生效的全量内容。
* 前端对这两个 JSON 做字段级 diff，即可看出司机这次改了什么。
* <p>
* 两侧的 JSON 结构完全一致（同一套提交结构），因此可以逐键直接比较。
*
* @author Chill
*/
@Data
@Schema(description = "认证审核详情")
public class CertAuditDetailVO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "认证记录主键")
private Long id;
@Schema(description = "认证对象类型：driver-司机，vehicle-车辆")
private String bizType;
@Schema(description = "认证对象主键")
private Long bizId;
@Schema(description = "展示键：司机姓名 / 车牌号")
private String bizKey;
@Schema(description = "审核状态：0审核中 1已通过 2已驳回 3已作废")
private Integer status;
@Schema(description = "状态中文文案")
private String statusText;
@Schema(description = "本次提交时间")
private LocalDateTime submitTime;
@Schema(description = "本次提交人")
private Long submitUser;
@Schema(description = "本次提交人姓名")
private String submitUserName;
@Schema(description = "本次审核人；未审核时为 null")
private Long auditUser;
@Schema(description = "本次审核人姓名；未审核时为空")
private String auditUserName;
@Schema(description = "审核时间（通过或驳回的时间）；未审核时为 null")
private LocalDateTime auditTime;
@Schema(description = "待审快照：本次提交的全量内容")
private String pendingSnapshotJson;
@Schema(description = "生效快照：该对象当前生效的全量内容；从未认证通过时为 null")
private String effectiveSnapshotJson;
@Schema(description = "生效快照记录ID；null 表示该对象从未认证通过")
private Long effectiveRecordId;
/**
* 该对象是否已认证
* <p>
* 审核页据此提示「本次驳回不会影响该对象继续使用」——
* 已认证的对象即便本次被驳回，既得认证依然有效。
*/
@TableField(exist = false)
@Schema(description = "该对象当前是否已认证")
private Boolean certified;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
+4
View File
@@ -58,6 +58,10 @@ public class CustomerArchiveVO extends CustomerArchive {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "联系人")
private List<CustomerContactVO> contacts = new ArrayList<>();
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverNodePunchVO.java
+3
View File
@@ -49,4 +49,7 @@ public class DriverNodePunchVO implements Serializable {
@Schema(description = "数量")
private String quantity;
@Schema(description = "本次打卡是否使运单自动完成")
private Boolean waybillCompleted;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverPunchNodeVO.java
+31 -1
View File
@@ -4,6 +4,8 @@
*/
package org.springblade.transport.pojo.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -34,9 +36,37 @@ public class DriverPunchNodeVO implements Serializable {
@Schema(description = "是否已打卡（在途=今日已打）")
private Boolean done;
@Schema(description = "当前是否可打卡（顺序门禁 + 在途频次时段）")
@Schema(description = "当前是否可打卡（已打卡、被异常阻断、在途频次时段都会置否）")
private Boolean actionable;
@Schema(description = "是否被未了结的异常阻断：异常所在节点及其后的节点不可打卡；在途只要有未了结异常即不可打卡")
private Boolean blocked;
@Schema(description = "是否因前置节点未打卡而被顺序门禁拦住（在途豁免，恒为否）")
private Boolean blockedByOrder;
@Schema(description = "顺序门禁拦住的原因，如「请先完成装货打卡」")
private String orderLockReason;
@Schema(description = "是否允许展开：顺序门禁不允许，异常门禁允许（可查看回填内容）")
private Boolean expandable;
@Schema(description = "该节点自身是否被上报了未了结异常（仅异常所在节点为是，其后被牵连阻断的节点为否）")
private Boolean hasException;
@Schema(description = "该运单是否存在未了结的整单异常；整单异常不归属任何节点，故每个节点都带此标记")
private Boolean hasWaybillException;
@Schema(description = "与该节点相关的未了结异常ID，按上报时间升序；相关 = 归属该节点 ∪ 整单异常")
private List<String> relatedExceptionIds = new ArrayList<>();
@Schema(description = "阻断该节点的异常处置ID（司机端「异常详情」跳转用）；未被阻断或异常已不存在时为空")
@JsonSerialize(using = ToStringSerializer.class)
private Long blockedExceptionId;
@Schema(description = "不可打卡的原因，供司机端展示")
private String lockReason;
@Schema(description = "是否展示该卡（在途可能因频次/时段隐藏）")
private Boolean visible;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java
+4
View File
@@ -69,4 +69,8 @@ public class DriverVO extends Driver {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate warningDate;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVehicleCardVO.java
+76 -16
View File
@@ -44,29 +44,89 @@ public class DriverVehicleCardVO implements Serializable {
@Schema(description = "车牌号")
private String plateNo;
@Schema(description = "所有人（行驶证登记的单位名称，不是司机）")
private String ownerName;
@Schema(description = "车牌颜色")
private String plateColor;
@Schema(description = "车辆类型")
private String vehicleType;
@Schema(description = "行驶证主页照片")
private String licenseFrontUrl;
@Schema(description = "行驶证副页照片")
private String licenseBackUrl;
@Schema(description = "道路运输证号")
private String roadTransportNo;
@Schema(description = "道路运输证照片")
private String roadTransportUrl;
@Schema(description = "车架号")
@Schema(description = "车辆识别代号（车架号），选填")
private String vin;
@Schema(description = "发动机号")
private String engineNo;
@Schema(description = "外廓长度，毫米")
private Integer outerLength;
@Schema(description = "外廓宽度，毫米")
private Integer outerWidth;
@Schema(description = "外廓高度，毫米")
private Integer outerHeight;
@Schema(description = "核定载质量，KG")
private Integer approvedLoadKg;
@Schema(description = "准牵引总质量，KG")
private Integer tractionMassKg;
@Schema(description = "能源类型")
private String energyType;
@Schema(description = "业务关系：自有 / 管理挂靠 / 业务合作")
private String businessRelation;
@Schema(description = "强制报废日期")
private String compulsoryScrapDate;
@Schema(description = "强制报废长期有效：0否 1是")
private Integer compulsoryScrapLongTerm;
@Schema(description = "行驶证档案编号")
private String drivingLicenseNo;
@Schema(description = "行驶证主页正面照片")
private String drivingLicenseImage;
@Schema(description = "行驶证主页反面照片")
private String drivingLicenseMainBack;
@Schema(description = "行驶证副页正面照片")
private String drivingLicenseViceFront;
@Schema(description = "行驶证副页反面照片")
private String drivingLicenseViceBack;
@Schema(description = "行驶证有效期起")
private String drivingLicenseStartDate;
@Schema(description = "行驶证有效期止")
private String licenseValidEnd;
private String drivingLicenseEndDate;
@Schema(description = "行驶证长期有效：0否 1是")
private Integer drivingLicenseLongTerm;
@Schema(description = "道路运输证号")
private String roadTransportCertNo;
@Schema(description = "道路运输证照片")
private String roadTransportCertImage;
@Schema(description = "道路运输证有效期起")
private String roadTransportCertStartDate;
@Schema(description = "道路运输证有效期止")
private String roadTransportCertEndDate;
@Schema(description = "道路运输证长期有效：0否 1是")
private Integer roadTransportCertLongTerm;
@Schema(description = "机动车登记编号")
private String registrationNo;
@Schema(description = "机动车登记本照片")
private String registrationImage;
@Schema(description = "认证状态：0认证中 1认证通过 2认证驳回")
private Integer certificationStatus;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EquipmentLedgerVO.java
+3
View File
@@ -25,5 +25,8 @@ public class EquipmentLedgerVO extends EquipmentLedger {
@Serial
private static final long serialVersionUID = 1L;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
private String updateUserName;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EtcRecordVO.java
+4
View File
@@ -26,6 +26,10 @@ public class EtcRecordVO extends EtcRecord {
@Serial
private static final long serialVersionUID = 1L;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/FormalSettlementVO.java
+13
View File
@@ -9,6 +9,7 @@
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.FormalSettlement;
@@ -18,6 +19,7 @@ import org.springblade.transport.pojo.entity.FormalSettlementInvoice;
import org.springblade.transport.pojo.entity.FormalSettlementSource;
import org.springblade.transport.pojo.entity.FormalSettlementPayment;
import org.springblade.transport.pojo.entity.FormalSettlementSummaryFee;
import org.springblade.transport.pojo.entity.InvoiceApplicationInvoice;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
@@ -39,6 +41,15 @@ public class FormalSettlementVO extends FormalSettlement {
@TableField(exist = false) private String ids;
@TableField(exist = false) private String approvalStatusName;
@TableField(exist = false) private String settlementTypeName;
@TableField(exist = false) private Integer attachmentCount;
@TableField(exist = false) private String attachmentSyncStatus;
@TableField(exist = false) private String attachmentSyncStatusName;
@TableField(exist = false) @Schema(description = "金蝶锁状态：locked-锁定中/failed-锁定失败；unlocked为终态不返回，null=无锁或已解锁")
private String kingdeeLockStatus;
@TableField(exist = false) @Schema(description = "金蝶锁失败原因（仅锁定失败时有值）")
private String kingdeeLockFailReason;
@TableField(exist = false) @Schema(description = "金蝶锁重试次数（达上限5后不再自动补偿，需重推同步金蝶）")
private Integer kingdeeTryCount;
@TableField(exist = false) private String preSettlementNos;
@TableField(exist = false) private String preSettlementNo;
@TableField(exist = false) private List<FormalSettlementSource> sources;
@@ -46,6 +57,8 @@ public class FormalSettlementVO extends FormalSettlement {
@TableField(exist = false) private List<FormalSettlementSummaryFee> summaryFees;
@TableField(exist = false) private List<FormalSettlementPayment> payments;
@TableField(exist = false) private List<FormalSettlementInvoice> invoices;
@TableField(exist = false) @Schema(description = "开票申请经金蝶回写的发票结果（含文件地址，只读展示）")
private List<InvoiceApplicationInvoice> issuedInvoices;
@TableField(exist = false) private List<PaymentApplicationVO> paymentApplications;
@TableField(exist = false) private List<SettlementAdjustmentVO> adjustments;
@TableField(exist = false) private List<FormalSettlementChangeRecord> changeRecords;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InsuranceRecordVO.java
+7
View File
@@ -63,6 +63,13 @@ public class InsuranceRecordVO extends InsuranceRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
/**
* 创建人姓名
*/
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
/**
* 更新人姓名
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InvoiceApplicationVO.java
+6
View File
@@ -49,6 +49,12 @@ public class InvoiceApplicationVO extends InvoiceApplication {
@TableField(exist = false) private String settlementNos;
@TableField(exist = false) private String approvalStatusName;
@TableField(exist = false) private String kingdeeStatusName;
@TableField(exist = false) private Integer attachmentCount;
@TableField(exist = false) private String attachmentSyncStatus;
@TableField(exist = false) private String attachmentSyncStatusName;
@TableField(exist = false) private String kingdeeLockStatus;
@TableField(exist = false) private String kingdeeLockFailReason;
@TableField(exist = false) private Integer kingdeeTryCount;
@TableField(exist = false) private String createUserName;
@TableField(exist = false) private List<InvoiceApplicationSettlement> settlements;
@TableField(exist = false) private List<InvoiceApplicationSheetVO> sheets;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InvoiceReceiptVO.java
+3
View File
@@ -49,6 +49,9 @@ public class InvoiceReceiptVO extends InvoiceReceipt {
@TableField(exist = false) private String settlementNos;
@TableField(exist = false) private String approvalStatusName;
@TableField(exist = false) private String kingdeePushStatusName;
@TableField(exist = false) private Integer attachmentCount;
@TableField(exist = false) private String attachmentSyncStatus;
@TableField(exist = false) private String attachmentSyncStatusName;
@TableField(exist = false) private String createUserName;
@TableField(exist = false) private String updateUserName;
@TableField(exist = false) private List<InvoiceReceiptSettlement> settlements;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenancePlanVO.java
+7
View File
@@ -62,6 +62,13 @@ public class MaintenancePlanVO extends MaintenancePlan {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
/**
* 创建人姓名
*/
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
/**
* 更新人姓名
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java
+7
View File
@@ -62,6 +62,13 @@ public class MaintenanceRecordVO extends MaintenanceRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
/**
* 创建人姓名
*/
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
/**
* 更新人姓名
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MasterOrderVO.java
+5
View File
@@ -41,6 +41,11 @@ public class MasterOrderVO extends MasterOrder {
private List<Waybill> boundWaybills;
@TableField(exist = false)
private BigDecimal totalQuantity;
/**
* 各品类已调度量（按货物名称+类型聚合，取各分段已调度量的最大值）
*/
@TableField(exist = false)
private Map<String, BigDecimal> dispatchedGoods;
@TableField(exist = false)
private String createUserName;
@TableField(exist = false)
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MileageRecordVO.java
+4
View File
@@ -66,6 +66,10 @@ public class MileageRecordVO extends MileageRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OilElectricRecordVO.java
+4
View File
@@ -76,6 +76,10 @@ public class OilElectricRecordVO extends OilElectricRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OtherExpenseRecordVO.java
+4
View File
@@ -49,6 +49,10 @@ public class OtherExpenseRecordVO extends OtherExpenseRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/PaymentApplicationVO.java
+6
View File
@@ -43,6 +43,12 @@ public class PaymentApplicationVO extends PaymentApplication {
@TableField(exist = false) private String paymentTypeName;
@TableField(exist = false) private String approvalStatusName;
@TableField(exist = false) private String kingdeeStatusName;
@TableField(exist = false) private Integer attachmentCount;
@TableField(exist = false) private String attachmentSyncStatus;
@TableField(exist = false) private String attachmentSyncStatusName;
@TableField(exist = false) private String kingdeeLockStatus;
@TableField(exist = false) private String kingdeeLockFailReason;
@TableField(exist = false) private Integer kingdeeTryCount;
@TableField(exist = false) private List<PaymentApplicationInvoice> invoices;
@TableField(exist = false) private List<PaymentApplicationRecord> paymentRecords;
@TableField(exist = false) private List<PaymentApplicationSettlement> settlements;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptClaimRecordVO.java
+5
View File
@@ -76,6 +76,11 @@ public class ReceiptClaimRecordVO extends ReceiptClaim {
private String claimStatusName;
@TableField(exist = false)
private String kingdeeBillStatusName;
/**
* 关联流水推送状态（none未推送/pushed已推送/failed推送失败，查询条件）
*/
@TableField(exist = false)
private String pushStatus;
@TableField(exist = false)
private List<ReceiptClaimSettlement> settlements;
@TableField(exist = false)
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java
+14
View File
@@ -58,6 +58,10 @@ public class ReceiptFlowVO extends KingdeeReceiptFlow {
@TableField(exist = false)
private String kingdeeClaimStatusName;
@TableField(exist = false)
private String pushStatusName;
@TableField(exist = false)
private String kingdeeBillStatusName;
@TableField(exist = false)
private BigDecimal remainingAmount;
@TableField(exist = false)
private String createUserName;
@@ -75,6 +79,16 @@ public class ReceiptFlowVO extends KingdeeReceiptFlow {
@TableField(exist = false)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime transactionEndTime;
/**
* 收款金额区间-最小值（查询条件）
*/
@TableField(exist = false)
private BigDecimal receiptAmountStart;
/**
* 收款金额区间-最大值（查询条件）
*/
@TableField(exist = false)
private BigDecimal receiptAmountEnd;
@TableField(exist = false)
private List<ReceiptFlowRecord> claimRecords = new ArrayList<>();
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TireReplacementRecordVO.java
+7
View File
@@ -63,6 +63,13 @@ public class TireReplacementRecordVO extends TireReplacementRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
/**
* 创建人姓名
*/
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
/**
* 更新人姓名
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportCertRecordVO.java
+100
View File
@@ -0,0 +1,100 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* 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.TransportCertRecord;
import java.io.Serial;
/**
* 认证记录视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "认证记录")
public class TransportCertRecordVO extends TransportCertRecord {
@Serial
private static final long serialVersionUID = 1L;
/**
* 创建人姓名
*/
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
/**
* 更新人姓名
*/
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
/**
* 提交人姓名
*/
@TableField(exist = false)
@Schema(description = "提交人姓名")
private String submitUserName;
/**
* 审核人姓名
*/
@TableField(exist = false)
@Schema(description = "审核人姓名")
private String auditUserName;
/**
* 状态中文文案：审核中 / 已通过 / 已驳回 / 已作废
* <p>
* 由服务层统一翻译后下发，避免小程序、Web、接口三处各造一套说法。
*/
@TableField(exist = false)
@Schema(description = "状态中文文案")
private String statusText;
/**
* 司机姓名（认证对象档案的**当前**姓名，不是提交时的历史值）
* <p>
* 司机侧取认证对象本身；车辆侧取提交该记录的司机。
* 解析不到档案时为空——存量订正记录里没有账号的那些司机补不出人，如实留空。
*/
@TableField(exist = false)
@Schema(description = "司机姓名")
private String driverName;
/**
* 司机手机号（认证对象档案的**当前**手机号，明文下发）
* <p>
* 审核员靠它联系司机核实材料，故不脱敏；认证快照里从来没有手机号，
* 它只有司机档案这一个来源。
*/
@TableField(exist = false)
@Schema(description = "司机手机号")
private String driverMobile;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportChangeRecordVO.java
+4
View File
@@ -57,6 +57,10 @@ public class TransportChangeRecordVO extends TransportChangeRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
@TableField(exist = false)
@Schema(description = "更新人姓名")
private String updateUserName;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportShipVO.java
+4
View File
@@ -62,4 +62,8 @@ public class TransportShipVO extends TransportShip {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate warningDate;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java
+4
View File
@@ -76,4 +76,8 @@ public class TransportVehicleVO extends TransportVehicle {
@Schema(description = "绑定司机")
private String boundDriver;
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ViolationRecordVO.java
+7
View File
@@ -63,6 +63,13 @@ public class ViolationRecordVO extends ViolationRecord {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
/**
* 创建人姓名
*/
@TableField(exist = false)
@Schema(description = "创建人姓名")
private String createUserName;
/**
* 更新人姓名
*/
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/VoucherFolderVO.java
+1
View File
@@ -25,6 +25,7 @@ public class VoucherFolderVO implements Serializable {
private String folderName;
private Long waybillId;
private String waybillNo;
private String loadingNo;
private Integer matched;
private String processStatus;
private String fileName;
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillImportRowErrorVO.java
+26
View File
@@ -0,0 +1,26 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
*/
package org.springblade.transport.pojo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/** 运单批量导入单行校验错误。 */
@Data
@Schema(description = "运单批量导入单行校验错误")
public class WaybillImportRowErrorVO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "行号（从0开始，相对当前批次）")
private Integer rowIndex;
@Schema(description = "错误信息")
private String errorMessage;
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillImportValidateResultVO.java
+28
View File
@@ -0,0 +1,28 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
*/
package org.springblade.transport.pojo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/** 运单批量导入校验结果。 */
@Data
@Schema(description = "运单批量导入校验结果")
public class WaybillImportValidateResultVO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "是否全部通过")
private Boolean success;
@Schema(description = "校验错误列表")
private List<WaybillImportRowErrorVO> errors = new ArrayList<>();
}
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillVO.java
+4
View File
@@ -66,6 +66,10 @@ public class WaybillVO extends Waybill {
@Schema(description = "业务状态名称")
private String businessStatusName;
@TableField(exist = false)
@Schema(description = "运输方式名称")
private String transportTypeName;
@TableField(exist = false)
@Schema(description = "是否需要司机确认接单（过程配置接单节点）")
private Boolean requireAccept;