From 286378a08ee6da7c34cf008fe61222d5adabda2c Mon Sep 17 00:00:00 2001 From: cjy Date: Fri, 19 Jul 2024 08:54:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-service/DS.WMS.MainApi/Controllers/PrintController.cs | 4 ++-- ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user | 2 +- ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/PrintController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/PrintController.cs index b70e1c85..a79d4a95 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/PrintController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/PrintController.cs @@ -130,12 +130,12 @@ namespace DS.WMS.MainApi.Controllers /// - /// 获取Json打印信息 + /// 获取Json本地打印信息 /// /// /// [HttpPost] - [Route("GetOpenJsonPrintInfo")] + [Route("GetJsonPrintInfoAsync")] public async Task> GetJsonPrintInfoAsync([FromBody] OpenJsonPrintReq req) { diff --git a/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user b/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user index 166ab595..996c16b7 100644 --- a/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user +++ b/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user @@ -1,6 +1,6 @@  - E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml + D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs b/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs index ab446ade..22bf7d34 100644 --- a/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs +++ b/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs @@ -18,7 +18,7 @@ namespace DS.WMS.PrintApi.Service { using (var db = SqlSugarUtil.GetInstance()) { - var template = db.Queryable().Where(x => x.Id == req.TemplateId).First(); + var template = db.Queryable().Filter(null,true).Where(x => x.Id == req.TemplateId).First(); if (template == null) { return await Task.FromResult(PrintDataResult.Failed("打印模板不存在!")); From f7067ab0e0babc6afe71bd9c16e486e35da5df02 Mon Sep 17 00:00:00 2001 From: cjy Date: Fri, 19 Jul 2024 11:19:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Op/Dtos/BusinessOrderContactReq.cs | 9 ++ .../Op/Dtos/BusinessOrderContactRes.cs | 8 ++ .../DS.WMS.Core/Op/Dtos/SeaExportReq.cs | 37 ++++++++ .../DS.WMS.Core/Op/Dtos/SeaExportRes.cs | 87 +++++++++++++++++-- .../Op/Entity/BusinessOrderContact.cs | 10 +++ .../DS.WMS.Core/Op/Entity/SeaExport.cs | 70 ++++++++++----- .../DS.WMS.Core/Op/Method/SeaExportService.cs | 28 +++++- ds-wms-service/DS.WMS.Test/SaasTest.cs | 2 +- 8 files changed, 216 insertions(+), 35 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactReq.cs index 23be7cfd..e7ab4e12 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactReq.cs @@ -36,6 +36,15 @@ namespace DS.WMS.Core.Op.Dtos /// 客户类别名称 /// public string CustomerTypeName { get; set; } + + /// + /// 客户Id + /// + public long CustomerId { get; set; } + /// + /// 客户名称 + /// + public string CustomerName { get; set; } /// /// 联系人 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactRes.cs index c6f4574d..939743ec 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/BusinessOrderContactRes.cs @@ -36,6 +36,14 @@ namespace DS.WMS.Core.Op.Dtos /// public string CustomerTypeName { get; set; } /// + /// 客户Id + /// + public long CustomerId { get; set; } + /// + /// 客户名称 + /// + public string CustomerName { get; set; } + /// /// 联系人 /// public string Name { get; set; } diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs index bafab208..2aae6645 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs @@ -1029,6 +1029,43 @@ public class SeaExportReq /// 拆票或合票标志 1-拆票 2-合票 /// public int SplitOrMergeFlag { get; set; } + + /// + /// Desc:单证人员 + /// + public string DocName { get; set; } + + /// + /// 操作员名称 + /// + public string OperatorName { get; set; } + /// + /// 客服名称 + /// + public string CustomerServiceName { get; set; } + + /// + /// 外国客服名称 + /// + public string ForeignCustomerServiceName { get; set; } + /// + /// 截VGM时间 + /// + public DateTime? VGMCloseDate { get; set; } + + /// + /// 单证备注 + /// + public string DocRemark { get; set; } + /// + /// 操作备注 + /// + public string OperatorRemark { get; set; } + + /// + /// 申请箱使 + /// + public string ApplyCtnRemark { get; set; } } /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs index 35b6e08e..77816d89 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs @@ -1,4 +1,6 @@ using DS.Module.Core; +using DS.Module.Core.Enums; +using Masuit.Tools.Systems; using SqlSugar; namespace DS.WMS.Core.Op.Dtos; @@ -31,12 +33,16 @@ public class SeaExportRes /// /// 业务状态名称 /// - public string BusinessStatusName { get; set; } + public string BusinessStatusName { get; set; } + /// - /// 整单费用状态 + /// 整单费用审核状态 /// - public BillAuditStatus BillFeeStatus { get; set; } = 0; - + public BillAuditStatus BillAuditStatus { get; set; } = 0; + /// + /// 整单费用审核状态描述 + /// + public string BillAuditStatusName => BillAuditStatus.GetDescription(); /// /// 整单费用状态时间 /// @@ -55,32 +61,57 @@ public class SeaExportRes /// Desc:是否费用锁定 /// public bool? IsFeeLocking { get; set; } = false; + /// /// 应收费用状态 /// - public int ARFeeStatus { get; set; } = 0; + public BillFeeStatus? ARFeeStatus { get; set; } + + /// + /// 应收费用状态描述 + /// + public string ARFeeStatusName => ARFeeStatus?.GetDescription(); /// /// 应付费用状态 /// - public int APFeeStatus { get; set; } = 0; + public BillFeeStatus? APFeeStatus { get; set; } + + /// + /// 应付费用状态描述 + /// + public string APFeeStatusName => APFeeStatus?.GetDescription(); /// /// 应收开票状态 /// - public int ARInvoiceStatus { get; set; } = 0; + public BillInvoiceStatus? ARInvoiceStatus { get; set; } + + /// + /// 应收费用状态描述 + /// + public string ARInvoiceStatusName => ARInvoiceStatus?.GetDescription(); /// /// 应付开票状态 /// - public int APInvoiceStatus { get; set; } = 0; + public BillInvoiceStatus? APInvoiceStatus { get; set; } + /// + /// 应付费用状态描述 + /// + public string APInvoiceStatusName => APInvoiceStatus?.GetDescription(); /// /// 应收对账状态 /// - public int ARCheckStatus { get; set; } = 0; + public BillCheckStatusEnum? ARCheckStatus { get; set; } + + /// + /// 应收对账状态描述 + /// + public string ARCheckStatusName => ARCheckStatus?.GetDescription(); /// /// 录入日期 /// @@ -1145,4 +1176,42 @@ public class SeaExportRes /// 预付地点Id /// public long PayableAtId { get; set; } + + + /// + /// Desc:单证人员 + /// + public string DocName { get; set; } + + /// + /// 操作员名称 + /// + public string OperatorName { get; set; } + /// + /// 客服名称 + /// + public string CustomerServiceName { get; set; } + + /// + /// 外国客服名称 + /// + public string ForeignCustomerServiceName { get; set; } + /// + /// 截VGM时间 + /// + public DateTime? VGMCloseDate { get; set; } + + /// + /// 单证备注 + /// + public string DocRemark { get; set; } + /// + /// 操作备注 + /// + public string OperatorRemark { get; set; } + + /// + /// 申请箱使 + /// + public string ApplyCtnRemark { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessOrderContact.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessOrderContact.cs index 3601a38c..d848dca0 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessOrderContact.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessOrderContact.cs @@ -38,6 +38,16 @@ namespace DS.WMS.Core.Op.Entity [SugarColumn(ColumnDescription = "客户类别名称", Length = 50, IsNullable = true)] public string CustomerTypeName { get; set; } /// + /// 客户Id + /// + [SugarColumn(ColumnDescription = "客户Id")] + public long CustomerId { get; set; } + /// + /// 客户名称 + /// + [SugarColumn(ColumnDescription = "客户名称", Length = 100, IsNullable = true)] + public string CustomerName { get; set; } + /// /// 联系人 /// [SugarColumn(ColumnDescription = "联系人", Length = 50, IsNullable = true)] diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs index 58103ae1..1ecd73af 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs @@ -26,30 +26,7 @@ public class SeaExport : BaseOrgModel /// 业务状态名称 /// [SqlSugar.SugarColumn(ColumnDescription = "业务状态名称", IsNullable = true, Length = 50)] - public string BusinessStatusName { get; set; } - ///// - ///// 单据费用状态 - ///// - //[SqlSugar.SugarColumn(ColumnDescription = "单据费用状态", IsNullable = false, DefaultValue = "0")] - //public int BillFeeStatus { get; set; } - ///// - ///// 单据费用状态名称 - ///// - //[SqlSugar.SugarColumn(ColumnDescription = "单据费用状态名称", IsNullable = true, Length = 50)] - //public string BillFeeStatusName { get; set; } - ///// - ///// 单据费用状态时间 - ///// - //[SqlSugar.SugarColumn(ColumnDescription = "单据费用状态时间", IsNullable = true)] - //public DateTime? BillFeeStatusTime { get; set; } - - ///// - ///// 费用状态 - ///// - //[SqlSugar.SugarColumn(ColumnDescription = "费用状态", IsNullable = false, DefaultValue = "0")] - //public int FeeStatus { get; set; } - - + public string BusinessStatusName { get; set; } /// /// Desc:是否业务锁定 /// @@ -1351,4 +1328,49 @@ public class SeaExport : BaseOrgModel /// [SqlSugar.SugarColumn(ColumnDescription = "拆票或合票标志 1-拆票 2-合票", IsNullable = true,DefaultValue = "0")] public int SplitOrMergeFlag { get; set; } + + /// + /// Desc:单证人员 + /// + [SugarColumn(ColumnDescription = "单证人员", IsNullable = true, Length = 30)] + public string DocName { get; set; } + + /// + /// 操作员名称 + /// + [SugarColumn(ColumnDescription = "操作员", IsNullable = true, Length = 30)] + public string OperatorName { get; set; } + /// + /// 客服名称 + /// + [SugarColumn(ColumnDescription = "客服名称", IsNullable = true,Length = 30)] + public string CustomerServiceName { get; set; } + + /// + /// 外国客服名称 + /// + [SugarColumn(ColumnDescription = "外国客服名称", IsNullable = true, Length = 30)] + public string ForeignCustomerServiceName { get; set; } + /// + /// 截VGM时间 + /// + [SqlSugar.SugarColumn(ColumnDescription = "截VGM时间", IsNullable = true)] + public DateTime? VGMCloseDate { get; set; } + + /// + /// 单证备注 + /// + [SugarColumn(ColumnDescription = "单证备注", IsNullable = true, Length = 100)] + public string DocRemark { get; set; } + /// + /// 操作备注 + /// + [SugarColumn(ColumnDescription = "操作备注", IsNullable = true, Length = 100)] + public string OperatorRemark { get; set; } + + /// + /// 申请箱使 + /// + [SugarColumn(ColumnDescription = "申请箱使", IsNullable = true, Length = 100)] + public string ApplyCtnRemark { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index db83bdd8..aa7f3b75 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -622,6 +622,8 @@ public partial class SeaExportService : ISeaExportService addList.Add(new BusinessOrderContact() { BusinessId = seaExport.Id, + CustomerId = seaExport.CustomerId, + CustomerName = seaExport.CustomerName, CustomerType = "controller", CustomerTypeName="委托单位", Name = defaultContact.ShortName, @@ -641,6 +643,8 @@ public partial class SeaExportService : ISeaExportService addList.Add(new BusinessOrderContact() { BusinessId = seaExport.Id, + CustomerId = seaExport.TruckerId, + CustomerName = seaExport.Trucker, CustomerType = "truck", CustomerTypeName = "车队", Name = defaultContact.ShortName, @@ -660,6 +664,8 @@ public partial class SeaExportService : ISeaExportService addList.Add(new BusinessOrderContact() { BusinessId = seaExport.Id, + CustomerId = seaExport.YardId, + CustomerName = seaExport.Yard, CustomerType = "yard", CustomerTypeName = "场站", Name = defaultContact.ShortName, @@ -669,7 +675,27 @@ public partial class SeaExportService : ISeaExportService } } } - + if (seaExport.ForwarderId != 0) + { + var defaultContact = sqlSugarScope.Queryable().Where(x => x.ClientId == seaExport.ForwarderId && x.IsOperator == true).First(); + if (defaultContact.IsNotNull()) + { + if (!contactLists.Where(x => x.BusinessType == BusinessType.OceanShippingExport && x.CustomerType == "booking" && x.Name == defaultContact.ShortName).Any()) + { + addList.Add(new BusinessOrderContact() + { + BusinessId = seaExport.Id, + CustomerId = seaExport.ForwarderId, + CustomerName = seaExport.Forwarder, + CustomerType = "booking", + CustomerTypeName = "订舱公司", + Name = defaultContact.ShortName, + Tel = defaultContact.Tel, + Email = defaultContact.Email, + }); + } + } + } if (addList.Count > 0) sqlSugarScope.Insertable(addList).ExecuteCommand(); } diff --git a/ds-wms-service/DS.WMS.Test/SaasTest.cs b/ds-wms-service/DS.WMS.Test/SaasTest.cs index 6a1842c5..7e36f6fc 100644 --- a/ds-wms-service/DS.WMS.Test/SaasTest.cs +++ b/ds-wms-service/DS.WMS.Test/SaasTest.cs @@ -81,7 +81,7 @@ public class SaasTest { var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 - tenantDb.CodeFirst.InitTables(typeof(BookingOrderUrl)); + tenantDb.CodeFirst.InitTables(typeof(SeaExport)); //tenantDb.CodeFirst.InitTables(typeof(BookingStatusLog)); //tenantDb.CodeFirst.InitTables(typeof(BookingStatus)); //tenantDb.CodeFirst.InitTables(typeof(BookingStatusLogDetail));