fix bug

2026-08-14 02:43:38 +08:00
parent 8e06aa3f68
commit 2373d62ceb
15 changed files with 579 additions and 25 deletions
@@ -0,0 +1,35 @@
+/**
+ * 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.util.List;
+import java.util.Map;
+
+/** 运单批量导入请求。 */
+@Data
+@Schema(description = "运单批量导入请求")
+public class WaybillImportBatchRequest {
+	private Long id;
+	private String batchNo;
+	private Long projectId;
+	private String projectName;
+	private String customerName;
+	private Long contractId;
+	private String contractName;
+	private String carrierType;
+	private Long carrierId;
+	private List<Long> carrierIds;
+	private String carrierName;
+	private String status;
+	private String importStatus;
+	private String importType;
+	private Long planId;
+	private String planName;
+	private String remark;
+	private List<Map<String, Object>> rows;
+}
@@ -0,0 +1,39 @@
+/**
+ * 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;
+
+/** 运单批量导入批次。 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_waybill_import_batch")
+@Schema(description = "运单批量导入批次")
+public class WaybillImportBatch extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+	private String batchNo;
+	private Long projectId;
+	private String projectName;
+	private String customerName;
+	private Long contractId;
+	private String contractName;
+	private String carrierType;
+	private String carrierIds;
+	private String carrierName;
+	private String importType;
+	private String importStatus;
+	private Long planId;
+	private String planName;
+	private Integer waybillCount;
+	private String remark;
+}
@@ -0,0 +1,25 @@
+/**
+ * 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 lombok.EqualsAndHashCode;
+import org.springblade.transport.pojo.entity.WaybillImportBatch;
+
+import java.io.Serial;
+
+/** 运单批次视图。 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "运单批次视图")
+public class WaybillImportBatchVO extends WaybillImportBatch {
+	@Serial
+	private static final long serialVersionUID = 1L;
+	private String importTypeName;
+	private String statusName;
+	private String createUserName;
+	private String updateUserName;
+}