修复业务模块bug
This commit is contained in:
+3
@@ -114,6 +114,9 @@ public class ShippingTemplate extends TenantEntity {
|
||||
@Schema(description = "所属组织")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "基本信息备注")
|
||||
private String basicRemark;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
+13
@@ -30,6 +30,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 运输计划实体类
|
||||
@@ -114,6 +115,9 @@ public class TransportPlan extends TenantEntity {
|
||||
@Schema(description = "货物信息")
|
||||
private String goodsJson;
|
||||
|
||||
@Schema(description = "费用信息")
|
||||
private String freightJson;
|
||||
|
||||
@Schema(description = "附件")
|
||||
private String attachmentsJson;
|
||||
|
||||
@@ -123,6 +127,15 @@ public class TransportPlan extends TenantEntity {
|
||||
@Schema(description = "业务状态")
|
||||
private String businessStatus;
|
||||
|
||||
@Schema(description = "调度人ID")
|
||||
private Long dispatcherUserId;
|
||||
|
||||
@Schema(description = "调度人姓名")
|
||||
private String dispatcherUserName;
|
||||
|
||||
@Schema(description = "调度时间")
|
||||
private LocalDateTime dispatchTime;
|
||||
|
||||
@Schema(description = "所属组织ID")
|
||||
private Long deptId;
|
||||
|
||||
|
||||
+6
@@ -27,8 +27,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.springblade.transport.pojo.entity.TransportPlan;
|
||||
import org.springblade.transport.pojo.entity.Waybill;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 运输计划视图实体类
|
||||
@@ -62,5 +64,9 @@ public class TransportPlanVO extends TransportPlan {
|
||||
@Schema(description = "业务状态名称")
|
||||
private String businessStatusName;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "计划调度生成的运单")
|
||||
private List<Waybill> dispatchRows;
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user