From 79cb476603cf14dc0b6945e8ddc48a7768ac9b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Mon, 11 Nov 2024 17:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=B1=9E=E6=80=A7=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Info/Entity/InfoClientTag.cs | 222 ++++++++++++++++++ .../Info/Method/ClientInfoService.cs | 1 - .../Controllers/ClientInfoController.cs | 5 +- 3 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs new file mode 100644 index 00000000..72ffccb4 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs @@ -0,0 +1,222 @@ +//using DS.Module.Core.Data; +//using SqlSugar; + +//namespace DS.WMS.Core.Info.Entity; + +///// +///// 往来单位标识 +///// +//[SugarTable("info_client_tag", "往来单位标识")] +//public class InfoClientTag : BaseModelV2 +//{ +// /// +// /// 往来单位id +// /// +// public long ClientId { get; set; } + +// ///// +// ///// Desc:是否特批放单客户 +// ///// +// //[SugarColumn(ColumnDescription = "是否特批放单客户", DefaultValue = "0")] +// //public bool IsSpecialApproval { get; set; } + +// /// +// /// Desc:是否船公司 +// /// +// [SugarColumn(ColumnDescription = "是否船公司", DefaultValue = "0")] +// public bool IsCarrier { get; set; } = false; + +// /// +// /// Desc:是否订舱公司 +// /// +// [SugarColumn(ColumnDescription = "是否订舱公司", DefaultValue = "0")] +// public bool IsBooking { get; set; } = false; + +// /// +// /// Desc:是否场站 +// /// +// [SugarColumn(ColumnDescription = "是否场站", DefaultValue = "0")] +// public bool IsYard { get; set; } = false; + +// /// +// /// Desc:是否车队 +// /// +// [SugarColumn(ColumnDescription = "是否车队", DefaultValue = "0")] +// public bool IsTruck { get; set; } = false; + +// /// +// /// Desc:是否委托单位 +// /// +// [SugarColumn(ColumnDescription = "是否委托单位", DefaultValue = "0")] +// public bool IsController { get; set; } = false; + +// /// +// /// Desc:是否报关行 +// /// +// [SugarColumn(ColumnDescription = "是否报关行", DefaultValue = "0")] +// public bool IsCustom { get; set; } = false; + +// /// +// /// Desc:是否代理(国外) +// /// +// [SugarColumn(ColumnDescription = "是否代理(国外)", DefaultValue = "0")] +// public bool IsAgent { get; set; } = false; + +// /// +// /// Desc:是否代理(国内) +// /// +// [SugarColumn(ColumnDescription = "是否代理(国内)", DefaultValue = "0")] +// public bool IsAgentCn { get; set; } = false; + +// /// +// /// Desc:是否快递公司 +// /// +// [SugarColumn(ColumnDescription = "是否快递公司", DefaultValue = "0")] +// public bool IsExpress { get; set; } = false; + +// /// +// /// Desc:是否航空公司 +// /// +// [SugarColumn(ColumnDescription = "是否航空公司", DefaultValue = "0")] +// public bool IsAirLines { get; set; } = false; + +// /// +// /// Desc:是否发货人 +// /// +// [SugarColumn(ColumnDescription = "是否发货人", DefaultValue = "0")] +// public bool IsShipper { get; set; } = false; + +// /// +// /// Desc:是否收货人 +// /// +// [SugarColumn(ColumnDescription = "是否收货人", DefaultValue = "0")] +// public bool IsConsignee { get; set; } = false; + +// /// +// /// Desc:是否通知人 +// /// +// [SugarColumn(ColumnDescription = "是否通知人", DefaultValue = "0")] +// public bool IsNotifyParty { get; set; } = false; + +// /// +// /// Desc:是否仓库 +// /// +// [SugarColumn(ColumnDescription = "是否仓库", DefaultValue = "0")] +// public bool IsWareHouse { get; set; } + + +// /// +// /// Desc:是否码头 +// /// +// [SugarColumn(ColumnDescription = "是否码头", DefaultValue = "0")] +// public bool IsWharf { get; set; } = false; + +// /// +// /// Desc:是否保险公司 +// /// +// [SugarColumn(ColumnDescription = "是否保险公司", DefaultValue = "0")] +// public bool IsInsurer { get; set; } = false; + +// /// +// /// Desc:是否租箱公司 +// /// +// [SugarColumn(ColumnDescription = "是否租箱公司", DefaultValue = "0")] +// public bool IsLeasing { get; set; } = false; + +// /// +// /// Desc:是否贸易代理 +// /// +// [SugarColumn(ColumnDescription = "是否贸易代理", DefaultValue = "0")] +// public bool IsTradingAgency { get; set; } = false; + +// /// +// /// Desc:是否其他 +// /// +// [SugarColumn(ColumnDescription = "是否其他", DefaultValue = "0")] +// public bool IsOther { get; set; } = false; + +// /// +// /// Desc:其他类型 +// /// +// [SugarColumn(ColumnDescription = "其他类型", Length = 100,IsNullable = true)] +// public string Others { get; set; } + + +// /// +// /// Desc:是否船代 +// /// +// [SugarColumn(ColumnDescription = "是否船代", DefaultValue = "0")] +// public bool IsShipAgency { get; set; } + +// /// +// /// Desc:是否经营单位 +// /// +// [SugarColumn(ColumnDescription = "是否经营单位", DefaultValue = "0")] +// public bool IsEnterprise { get; set; } = false; + +// /// +// /// Desc:是否国内发货人 +// /// +// [SugarColumn(ColumnDescription = "是否国内发货人", DefaultValue = "0")] +// public bool IsShipperCn { get; set; } = false; + +// /// +// /// Desc:是否约主 +// /// +// [SugarColumn(ColumnDescription = "是否约主", DefaultValue = "0")] +// public bool IsContract { get; set; } = false; + +// /// +// /// 是否国内同行 +// /// +// [SugarColumn(ColumnDescription = "是否国内同行", DefaultValue = "0")] +// public bool IsDomesticPeers { get; set; } + +// /// +// /// 是否国外同行 +// /// +// [SugarColumn(ColumnDescription = "是否国外同行", DefaultValue = "0")] +// public bool IsForeignCounterparts { get; set; } + +// /// +// /// 是否国内直客 +// /// +// [SugarColumn(ColumnDescription = "是否国内直客", DefaultValue = "0")] +// public bool IsDirectCustomerCn { get; set; } + +// /// +// /// 是否国外直客 +// /// +// [SugarColumn(ColumnDescription = "是否国外直客", DefaultValue = "0")] +// public bool IsDirectCustomer { get; set; } + +// /// +// /// 是否指定货发货人 +// /// +// [SugarColumn(ColumnDescription = "是否指定货发货人", DefaultValue = "0")] +// public bool IsShipperZDH { get; set; } + +// /// +// /// 是否个人 +// /// +// [SugarColumn(ColumnDescription = "是否个人", DefaultValue = "0")] +// public bool IsPersonal { get; set; } + +// /// +// /// 是否装箱加固 +// /// +// [SugarColumn(ColumnDescription = "是否装箱加固", DefaultValue = "0")] +// public bool IsPacking { get; set; } + +// /// +// /// 是否放箱公司 +// /// +// [SugarColumn(ColumnDescription = "是否放箱公司", DefaultValue = "0")] +// public bool IsContainerCompany { get; set; } + +// /// +// /// 机构Id +// /// +// [SugarColumn(ColumnDescription = "机构Id")] +// public long OrgId { get; set; } +//} \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs b/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs index 9ccc1ab5..e234652a 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs @@ -16,7 +16,6 @@ using DS.WMS.Core.Sys.Entity; using DS.WMS.Core.Sys.Interface; using DS.WMS.Core.TaskInteraction.Dtos; using DS.WMS.Core.TaskInteraction.Interface; -using Fasterflect; using Mapster; using Masuit.Tools.Systems; using Microsoft.Extensions.DependencyInjection; diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs index d8543c8e..72574183 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs @@ -61,6 +61,9 @@ public class ClientInfoController : ApiController // List attributes = []; // foreach (var dbLink in dbLinks) // { + // if (dbLink.TenantId != 1819549542425694208) + // continue; + // tenantDb = new SqlSugarClient(new ConnectionConfig // { // ConfigId = dbLink.Id, @@ -75,7 +78,7 @@ public class ClientInfoController : ApiController // foreach (var item in dicList) // { // object value = PropertyExtensions.GetPropertyValue(tag, item.ArName); - // if (value != null && value is bool boolVal && boolVal) + // if (value is bool boolVal && boolVal) // { // var attribute = new InfoClientAttribute // {