1、新增总单

2、fix bug
2026-08-11 23:50:37 +08:00
parent 4e7e354349
commit 7f31952bff
12 changed files with 617 additions and 0 deletions
@@ -0,0 +1,17 @@
+package org.springblade.transport.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 多联总单调度请求。
+ */
+@Data
+@Schema(description = "多联总单调度请求")
+public class MasterOrderDispatchRequest {
+	private Long id;
+	private List<Map<String, Object>> dispatches;
+}
@@ -0,0 +1,51 @@
+/**
+ * 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.time.LocalDateTime;
+
+/**
+ * 多联总单实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_master_order")
+@Schema(description = "多联总单")
+public class MasterOrder extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+	private String masterNo;
+	private Long projectId;
+	private String projectName;
+	private Long contractId;
+	private String contractName;
+	private String customerName;
+	private String transportOrganizationType;
+	private String businessStatus;
+	private String departureName;
+	private String departureAddress;
+	private String departureContact;
+	private String departurePhone;
+	private String arrivalName;
+	private String arrivalAddress;
+	private String arrivalContact;
+	private String arrivalPhone;
+	private LocalDateTime planStartTime;
+	private LocalDateTime planEndTime;
+	private String routeJson;
+	private String goodsJson;
+	private String attachmentsJson;
+	private String remark;
+}
@@ -48,6 +48,12 @@ public class TransportPlan extends TenantEntity {
 	@Schema(description = "计划单号")
 	private String planNo;

+	@Schema(description = "多联总单号")
+	private String masterNo;
+
+	@Schema(description = "总单分段号")
+	private String relationNo;
+
 	@Schema(description = "计划名称")
 	private String planName;

@@ -0,0 +1,45 @@
+/** BladeX Commercial License Agreement */
+package org.springblade.transport.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.transport.pojo.entity.MasterOrder;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 多联总单视图实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MasterOrderVO extends MasterOrder {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+	@TableField(exist = false)
+	private String masterNos;
+	@TableField(exist = false)
+	private String cargoName;
+	@TableField(exist = false)
+	private String cargoType;
+	@TableField(exist = false)
+	private String contractNo;
+	@TableField(exist = false)
+	private List<Map<String, Object>> routes;
+	@TableField(exist = false)
+	private List<Map<String, Object>> goods;
+	@TableField(exist = false)
+	private List<Map<String, Object>> routeProgress;
+	@TableField(exist = false)
+	private BigDecimal totalQuantity;
+	@TableField(exist = false)
+	private String createUserName;
+	@TableField(exist = false)
+	private String updateUserName;
+}
@@ -63,6 +63,10 @@ public class ProjectApplyVO extends ProjectApply {
 	@Schema(description = "审批状态名称")
 	private String approvalStatusName;

+	@TableField(exist = false)
+	@Schema(description = "审批状态集合，多个状态使用逗号分隔")
+	private String approvalStatuses;
+
 	@TableField(exist = false)
 	@Schema(description = "生效类型名称")
 	private String effectiveTypeName;