From ec75ed94adcf3f3c818bbf17d8f0d72938ecaa1a Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Mon, 28 Nov 2022 16:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Myshipping.Application.xml | 64 +++++++++++++++++++
.../BookingOrder/BookingOrderService.cs | 2 -
Myshipping.Core/Entity/DBEntityTenant.cs | 2 +-
Myshipping.Core/Entity/DEntityBase.cs | 14 ++--
4 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index 51161bae..c4f13967 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -4881,6 +4881,20 @@
+
+
+ 批量编辑vgm
+
+ 业务id 逗号拼接
+
+
+
+
+ 批量保存vgm
+
+
+
+
发送订舱、截单EDI
@@ -5036,6 +5050,56 @@
截单日期
+
+
+ id
+
+
+
+
+ 提单号
+
+
+
+
+ 箱id
+
+
+
+
+ 箱型代码
+
+
+
+
+ 箱型
+
+
+
+
+ 箱号
+
+
+
+
+ 毛重
+
+
+
+
+ 皮重
+
+
+
+
+ 称重方式
+
+
+
+
+ 称重重量
+
+
操作类型（新增，编辑）
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index fe94df6c..224ce2ea 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -1874,8 +1874,6 @@ namespace Myshipping.Application
}
}
-
-
#endregion
#region 订舱、截单EDI
diff --git a/Myshipping.Core/Entity/DBEntityTenant.cs b/Myshipping.Core/Entity/DBEntityTenant.cs
index 0a8b5778..5dd8d9a1 100644
--- a/Myshipping.Core/Entity/DBEntityTenant.cs
+++ b/Myshipping.Core/Entity/DBEntityTenant.cs
@@ -14,7 +14,7 @@ public abstract class DBEntityTenant : DEntityBase
///
/// 租户id
///
- [SugarColumn(ColumnDescription = "租户id")]
+ //[SugarColumn(ColumnDescription = "租户id")]
public virtual long? TenantId { get; set; }
diff --git a/Myshipping.Core/Entity/DEntityBase.cs b/Myshipping.Core/Entity/DEntityBase.cs
index ef1e5ed3..7c5787d7 100644
--- a/Myshipping.Core/Entity/DEntityBase.cs
+++ b/Myshipping.Core/Entity/DEntityBase.cs
@@ -15,45 +15,45 @@ public abstract class DEntityBase : PrimaryKeyEntity
///
/// 创建时间
///
- [SugarColumn(ColumnDescription = "创建时间")]
+ //[SugarColumn(ColumnDescription = "创建时间")]
public virtual DateTime? CreatedTime { get; set; }
///
/// 更新时间
///
- [SugarColumn(ColumnDescription = "更新时间")]
+ //[SugarColumn(ColumnDescription = "更新时间")]
public virtual DateTime? UpdatedTime { get; set; }
///
/// 创建者Id
///
- [SugarColumn(ColumnDescription = "创建者Id")]
+ //[SugarColumn(ColumnDescription = "创建者Id")]
public virtual long? CreatedUserId { get; set; }
///
/// 创建者名称
///
[MaxLength(20)]
- [SugarColumn(ColumnDescription = "创建者名称")]
+ //[SugarColumn(ColumnDescription = "创建者名称")]
public virtual string CreatedUserName { get; set; }
///
/// 修改者Id
///
- [SugarColumn(ColumnDescription = "修改者Id")]
+ //[SugarColumn(ColumnDescription = "修改者Id")]
public virtual long? UpdatedUserId { get; set; }
///
/// 修改者名称
///
[MaxLength(20)]
- [SugarColumn(ColumnDescription = "修改者名称")]
+ //[SugarColumn(ColumnDescription = "修改者名称")]
public virtual string UpdatedUserName { get; set; }
///
/// 软删除
///
- [SugarColumn(ColumnDescription = "软删除")]
+ //[SugarColumn(ColumnDescription = "软删除")]
public virtual bool IsDeleted { get; set; } = false;