From a6322caf5548aa1d61e039571d285883b64242be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Tue, 3 Sep 2024 09:44:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/Dtos/ApplicationDto.cs | 8 ++--- .../Application/Dtos/InvoiceApplicationDto.cs | 20 +++++++++---- .../Application/Entity/ApplicationBase.cs | 4 +-- .../Application/Entity/InvoiceApplication.cs | 27 ++++++++--------- .../IInvoiceApplicationAuditService.cs | 2 +- .../Method/InvoiceApplicationAuditService.cs | 29 +++++-------------- .../Method/InvoiceApplicationService.cs | 25 +++++++++------- .../Method/PaymentApplicationAuditService.cs | 2 +- .../Method/PaymentApplicationService.cs | 4 +-- .../TaskInteraction/BusinessTaskMail.cs | 4 +-- .../Method/PaymentSettlementService.cs | 2 +- .../Controllers/FeeAuditController.cs | 1 + .../InvoiceApplicationAuditController.cs | 2 +- 13 files changed, 66 insertions(+), 64 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Application/Dtos/ApplicationDto.cs b/ds-wms-service/DS.WMS.Core/Application/Dtos/ApplicationDto.cs index 8dbdc9ef..d447b9ec 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Dtos/ApplicationDto.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Dtos/ApplicationDto.cs @@ -26,17 +26,17 @@ namespace DS.WMS.Core.Application.Dtos public string? CustomerName { get; set; } /// - /// 客户银行账号ID + /// RMB客户银行ID /// public long? CustomerBankId { get; set; } /// - /// 客户银行 + /// RMB银行名称 /// - public string? CustomerBank { get; set; } + public string? CustomerBankName { get; set; } /// - /// 客户银行 + /// RMB银行账号 /// public string? CustomerAccount { get; set; } diff --git a/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs b/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs index 339afe91..2d2d86b4 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs @@ -91,11 +91,6 @@ namespace DS.WMS.Core.Application.Dtos /// public string? InvoiceBillNO { get; set; } - /// - /// 开票币别 - /// - public string InvoiceCurrency { get; set; } - /// /// 金额描述 /// @@ -123,6 +118,21 @@ namespace DS.WMS.Core.Application.Dtos /// public string? InvoiceRemark { get; set; } + /// + /// USD客户银行ID + /// + public long? USDCustomerBankId { get; set; } + + /// + /// USD银行名称 + /// + public string? USDCustomerBankName { get; set; } + + /// + /// USD银行账号 + /// + public string? USDCustomerAccount { get; set; } + /// /// 创建人ID /// diff --git a/ds-wms-service/DS.WMS.Core/Application/Entity/ApplicationBase.cs b/ds-wms-service/DS.WMS.Core/Application/Entity/ApplicationBase.cs index ce1fead5..7f51624e 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Entity/ApplicationBase.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Entity/ApplicationBase.cs @@ -43,7 +43,7 @@ namespace DS.WMS.Core.Application.Entity /// /// 客户银行账号ID /// - [SugarColumn(ColumnDescription = "客户银行账号ID", Length = 100)] + [SugarColumn(ColumnDescription = "客户银行账号ID", IsNullable = true)] public long? CustomerBankId { get; set; } /// @@ -61,7 +61,7 @@ namespace DS.WMS.Core.Application.Entity /// /// 所属分部 /// - [SugarColumn(ColumnDescription = "所属分部")] + [SugarColumn(ColumnDescription = "所属分部", IsNullable = true)] public long? SaleDeptId { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Application/Entity/InvoiceApplication.cs b/ds-wms-service/DS.WMS.Core/Application/Entity/InvoiceApplication.cs index 9ded2595..e79b10bd 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Entity/InvoiceApplication.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Entity/InvoiceApplication.cs @@ -1,4 +1,5 @@ using DS.Module.Core.Enums; +using DS.WMS.Core.Info.Entity; using SqlSugar; namespace DS.WMS.Core.Application.Entity @@ -9,6 +10,18 @@ namespace DS.WMS.Core.Application.Entity [SugarTable("application_invoice", TableDescription = "发票申请单")] public class InvoiceApplication : ApplicationForm { + /// + /// 客户银行美元账号ID + /// + [SugarColumn(ColumnDescription = "客户银行美元账号ID", IsNullable = true)] + public long? USDCustomerBankId { get; set; } + + /// + /// 客户银行美元账号 + /// + [Navigate(NavigateType.OneToOne, nameof(USDCustomerBankId))] + public InfoClientBank? USDCustomerBank { get; set; } + /// /// 状态 /// @@ -33,12 +46,6 @@ namespace DS.WMS.Core.Application.Entity [SugarColumn(ColumnDescription = "发票单据号", Length = 30, IsNullable = true)] public string? InvoiceBillNO { get; set; } - /// - /// 开票币别 - /// - [SugarColumn(ColumnDescription = "开票币别", Length = 3, IsNullable = false)] - public string? InvoiceCurrency { get; set; } - /// /// 发票税率 /// @@ -49,7 +56,7 @@ namespace DS.WMS.Core.Application.Entity /// 纳税人识别号 /// [SugarColumn(ColumnDescription = "纳税人识别号", Length = 60, IsNullable = false)] - public string TaxID { get; set; } + public string TaxID { get; set; } = string.Empty; /// /// 申请金额 @@ -63,12 +70,6 @@ namespace DS.WMS.Core.Application.Entity [SugarColumn(ColumnDescription = "申请金额大写", Length = 100, IsNullable = true)] public string? AmountUppercase { get; set; } - /// - /// 所属机构（公司） - /// - [SugarColumn(ColumnDescription = "所属机构（公司）")] - public long? OrgId { get; set; } - /// /// 客户地址电话 /// diff --git a/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationAuditService.cs b/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationAuditService.cs index 3e657367..0e2915bd 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationAuditService.cs @@ -14,7 +14,7 @@ namespace DS.WMS.Core.Application.Interface /// /// /// - Task>> GetListAsync(PageRequest request); + Task>> GetListAsync(PageRequest request); } diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs index 3f1eaef4..131198e2 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs @@ -31,7 +31,8 @@ namespace DS.WMS.Core.Application.Method /// /// /// - public async Task>> GetListAsync(PageRequest request) + /// 注意！！【仅查看待审核】需要通过 OtherQueryCondition 属性传入 + public async Task>> GetListAsync(PageRequest request) { var query = CreateListQuery(); @@ -39,28 +40,14 @@ namespace DS.WMS.Core.Application.Method { var whereList = Db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition); - int? index = null; - foreach (var item in whereList) + //设置了状态筛选 + if (request.OtherQueryCondition.HasValue) { - ConditionalModel? model = item as ConditionalModel; - if (model == null) - continue; - - //设置了状态筛选 - if (string.Equals(model.FieldName, nameof(InvoiceApplicationDto.IsAudited)) && bool.TryParse(model.FieldValue, out bool isAudited)) - { - if (isAudited) - query = query.Where(x => x.Status == InvoiceApplicationStatus.AuditPassed || x.Status == InvoiceApplicationStatus.AuditRejected); - else - query = query.Where(x => x.Status == InvoiceApplicationStatus.AuditSubmittd); - - index = whereList.IndexOf(item); - break; - } + if (request.OtherQueryCondition.Value) + query = query.Where(x => x.Status == InvoiceApplicationStatus.AuditPassed || x.Status == InvoiceApplicationStatus.AuditRejected); + else + query = query.Where(x => x.Status == InvoiceApplicationStatus.AuditSubmittd); } - if (index.HasValue) - whereList.RemoveAt(index.Value); - query = query.Where(whereList); } diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs index defba0ae..3d3375e0 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs @@ -48,7 +48,6 @@ namespace DS.WMS.Core.Application.Method InvoiceHeader = x.InvoiceHeader, Currency = x.Currency, ApplyAmount = x.ApplyAmount, - InvoiceCurrency = x.InvoiceCurrency, InvoiceAmount = x.InvoiceAmount, CreateTime = x.CreateTime, //申请时间 CreateBy = x.CreateBy, //申请人ID @@ -280,21 +279,20 @@ namespace DS.WMS.Core.Application.Method public async Task> GetAsync(long id) { var dto = await TenantDb.Queryable().Where(a => a.Id == id) - .LeftJoin((a, b) => a.CustomerBankId == b.Id) - .Select((a, b) => new InvoiceApplicationDto + .LeftJoin((a, b1) => a.CustomerBankId == b1.Id) + .LeftJoin((a, b1, b2) => a.USDCustomerBankId == b2.Id) + .Select((a, b1, b2) => new InvoiceApplicationDto { Id = a.Id, ApplicationNO = a.ApplicationNO, Currency = a.Currency, CustomerId = a.CustomerId, CustomerName = a.CustomerName, - CustomerBankId = a.CustomerBankId, Status = a.Status, CreateTime = a.CreateTime, CreateBy = a.CreateBy, InvoiceDate = a.InvoiceDate, InvoiceAmount = a.InvoiceAmount, - InvoiceCurrency = a.InvoiceCurrency, InvoiceHeader = a.InvoiceHeader, InvoiceNO = a.InvoiceNO, InvoiceBillNO = a.InvoiceBillNO, @@ -305,13 +303,21 @@ namespace DS.WMS.Core.Application.Method OtherCurrencyAmount = a.OtherCurrencyAmount, Category = a.Category, CustomerAddTel = a.CustomerAddTel, - CustomerBank = b.BankName, - CustomerAccount = b.Account, + + CustomerBankId = a.CustomerBankId, + CustomerBankName = b1.BankName, + CustomerAccount = b1.Account, + + USDCustomerBankId = a.USDCustomerBankId, + USDCustomerBankName = b2.BankName, + USDCustomerAccount = b2.Account }).FirstAsync(); if (dto != null) { - dto.InvoiceDetails = await TenantDb.Queryable().Where(x => x.ApplicationId == dto.Id).ToListAsync(); + dto.CreateByName = await Db.Queryable().Where(x => x.Id == dto.CreateBy).Select(x => x.UserName).FirstAsync(); + + dto.InvoiceDetails = await TenantDb.Queryable().Where(x => x.ApplicationId == dto.Id && x.Category == DetailCategory.InvoiceApplication).ToListAsync(); dto.Details = await TenantDb.Queryable().LeftJoin((d, f) => d.RecordId == f.Id) .Where(d => d.ApplicationId == id).Select((d, f) => new InvoiceApplicationDetailDto @@ -524,9 +530,6 @@ namespace DS.WMS.Core.Application.Method .UpdateColumns(x => new { x.OrderInvoiceAmount }) .ExecuteCommandAsync(); - //if (application.InvoiceCurrency.IsNullOrEmpty()) - // application.InvoiceCurrency = FeeCurrency.RMB_CODE; - await base.OnSaveAsync(application, fees); } diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs index 2953d2e6..5cfbcd75 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs @@ -112,7 +112,7 @@ namespace DS.WMS.Core.Application.Method Note = a.Note, BillNO = s.CustomerNo, //业务编号=委托编号 CustomerBankId = a.CustomerBankId, - CustomerBank = b.BankName, + CustomerBankName = b.BankName, CustomerAccount = b.Account }); diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationService.cs index 67ff50c8..3534198f 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationService.cs @@ -99,7 +99,7 @@ namespace DS.WMS.Core.Application.Method Note = a.Note, BillNO = s.CustomerNo, //业务编号=委托编号 CustomerBankId = a.CustomerBankId, - CustomerBank = a.CustomerBank.BankName, //结算对象银行 + CustomerBankName = a.CustomerBank.BankName, //结算对象银行 CustomerAccount = a.CustomerBank.Account, //结算对象账号 //汇总项 RestAmountRMB = SqlFunc.Subqueryable().Where(f => f.Id == d.RecordId && f.FeeStatus == FeeStatus.AuditPassed @@ -277,7 +277,7 @@ namespace DS.WMS.Core.Application.Method CustomerId = a.CustomerId, CustomerName = a.CustomerName, CustomerBankId = a.CustomerBankId, - CustomerBank = b.BankAccountNo, + CustomerBankName = b.BankAccountNo, Status = a.Status, CreateTime = a.CreateTime, CreateBy = a.CreateBy, diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/BusinessTaskMail.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/BusinessTaskMail.cs index 5bfec942..6e1eb6ae 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/BusinessTaskMail.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/BusinessTaskMail.cs @@ -31,8 +31,8 @@ namespace DS.WMS.Core.Op.Entity.TaskInteraction /// /// 内容模板 /// - [SugarColumn(ColumnDescription = "内容", ColumnDataType = "text", IsNullable = false)] - public string Content { get; set; } = string.Empty; + [SugarColumn(ColumnDescription = "内容", ColumnDataType = "longtext", IsNullable = false)] + public string? Content { get; set; } /// /// 客户名称 diff --git a/ds-wms-service/DS.WMS.Core/Settlement/Method/PaymentSettlementService.cs b/ds-wms-service/DS.WMS.Core/Settlement/Method/PaymentSettlementService.cs index 4fc7e5c2..696fb0f8 100644 --- a/ds-wms-service/DS.WMS.Core/Settlement/Method/PaymentSettlementService.cs +++ b/ds-wms-service/DS.WMS.Core/Settlement/Method/PaymentSettlementService.cs @@ -265,7 +265,7 @@ namespace DS.WMS.Core.Settlement.Method CustomerId = a.CustomerId, CustomerName = a.CustomerName, //结算单位 CustomerBankId = a.CustomerBankId, - CustomerBank = a.CustomerBank.BankName, //结算对象银行 + CustomerBankName = a.CustomerBank.BankName, //结算对象银行 CustomerAccount = a.CustomerBank.Account, //结算对象账号 Currency = a.Currency, AmountRMB = a.AmountRMB.GetValueOrDefault(), //RMB申请金额 diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeAuditController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeAuditController.cs index 76710415..0facaea0 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeAuditController.cs +++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeAuditController.cs @@ -28,6 +28,7 @@ namespace DS.WMS.FeeApi.Controllers /// /// /// + /// 注意！！【仅看待审批】需要通过 OtherQueryCondition 属性传入 [HttpPost, Route("GetList")] public async Task>> ListAsync([FromBody] PageRequest request) { diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/InvoiceApplicationAuditController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/InvoiceApplicationAuditController.cs index dbd5c9a7..f53a1a14 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Controllers/InvoiceApplicationAuditController.cs +++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/InvoiceApplicationAuditController.cs @@ -30,7 +30,7 @@ namespace DS.WMS.FeeApi.Controllers /// /// [HttpPost, Route("GetList")] - public async Task>> ListAsync([FromBody] PageRequest request) + public async Task>> ListAsync([FromBody] PageRequest request) { return await _auditService.GetListAsync(request); } From 00ee9f7fd15a70a6b8ec7d2d9aec8bfae703133d Mon Sep 17 00:00:00 2001 From: zhangxiaofeng <1939543722@qq.com> Date: Tue, 3 Sep 2024 09:53:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=B0=E5=A7=94?= =?UTF-8?q?=E6=89=98=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Op/Method/TaskInteraction/SeaExportTaskService.cs | 2 +- .../DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs | 2 +- .../TaskPlat/Dtos/TaskManageOrderMessageMainInfo.cs | 2 +- .../DS.WMS.Core/TaskPlat/Entity/TaskBaseInfo.cs | 2 +- .../DS.WMS.Core/TaskPlat/Method/TaskManageService.cs | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs index 40e440a1..92a5f116 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs @@ -100,7 +100,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction } }; info.Main.TaskDesp = info.Main.TaskTitle = $"【{item.TaskType.GetDescription()}】{biz?.CustomerNo} {biz?.Vessel} {biz?.Voyno} ETD:{biz?.ETD?.ToString("yyyy-MM-dd")}"; - info.Main.CUSTOMNER_NO = biz?.CustomerNo; + info.Main.CUSTOMER_NO = biz?.CustomerNo; info.Main.MBlNo = biz?.MBLNO; var result = await ManagerService.InitTaskJob(info); diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs index da344fe7..1a2dc028 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs @@ -247,7 +247,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction info.Main.TaskTitle = $"【{request.TaskType.GetDescription()}】{biz?.CustomerNo} {biz?.Vessel} {biz?.Voyno} ETD:{biz?.ETD?.ToString("yyyy-MM-dd")}"; info.Main.MBlNo = biz?.MBLNO; - info.Main.CUSTOMNER_NO = biz?.CustomerNo; + info.Main.CUSTOMER_NO = biz?.CustomerNo; } info.Main.TaskDesp = info.Main.TaskDesp ?? info.Main.TaskTitle; diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderMessageMainInfo.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderMessageMainInfo.cs index 33a296d2..eaba1f93 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderMessageMainInfo.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderMessageMainInfo.cs @@ -63,7 +63,7 @@ namespace DS.WMS.Core.TaskPlat.Dtos /// /// 委托编号 /// - public string? CUSTOMNER_NO { get; set; } + public string? CUSTOMER_NO { get; set; } /// /// 反馈结果 diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Entity/TaskBaseInfo.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Entity/TaskBaseInfo.cs index 7d6e605c..f21869e4 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Entity/TaskBaseInfo.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Entity/TaskBaseInfo.cs @@ -120,7 +120,7 @@ namespace DS.WMS.Core.TaskPlat.Entity /// 委托编号 /// [SugarColumn(ColumnDescription = "委托编号", IsNullable = true, Length = 30)] - public string? CUSTOMNER_NO { get; set; } + public string? CUSTOMER_NO { get; set; } /// /// 备注 diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs index c261862c..a335a3db 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs @@ -324,7 +324,7 @@ namespace DS.WMS.Core.TaskPlat.Method BATCH_STATIC = info.Main.BatchStatic, //DJYUserId = info.Head.DJYUserId, OUT_BS_NO = info.Head.BSNO, - CUSTOMNER_NO = info.Main.CUSTOMNER_NO, + CUSTOMER_NO = info.Main.CUSTOMER_NO, CreateTime = DateTime.Now, }; if (Enum.TryParse(typeof(TaskBaseTypeEnum), taskInfo.TASK_TYPE, out object? taskTypeTemp)) @@ -2213,7 +2213,7 @@ namespace DS.WMS.Core.TaskPlat.Method .Where(whereList) .Where((t, a) => t.STATUS != TaskStatusEnum.Cancel.ToString()) .Where((t, a) => t.IS_PUBLIC == 1 || (t.IS_PUBLIC == 0 && a.Status != null && (a.UserId == userId))) // 2024-8-14 boss提出只显示自己需要审批的任务，自己创建的任务不显示，所以去掉t.CreateBy == userId || - .WhereIF(!string.IsNullOrEmpty(querySearch.BusinessNo), (t, a) => t.MBL_NO == querySearch.BusinessNo || t.CUSTOMNER_NO == querySearch.BusinessNo) + .WhereIF(!string.IsNullOrEmpty(querySearch.BusinessNo), (t, a) => t.MBL_NO == querySearch.BusinessNo || t.CUSTOMER_NO == querySearch.BusinessNo) .GroupBy((t, a) => new { t.TASK_TYPE, t.STATUS, a.Status, t.IS_PUBLIC }) .Select((t, a) => new { @@ -2682,7 +2682,7 @@ namespace DS.WMS.Core.TaskPlat.Method .Where(whereList) .Where((t, a) => t.STATUS != TaskStatusEnum.Cancel.ToString()) .WhereIF(taskType != null, (t, a) => t.TASK_TYPE == taskType.ToString()) - .WhereIF(!string.IsNullOrEmpty(queryTaskManageDto.BusinessNo), (t, a) => t.MBL_NO == queryTaskManageDto.BusinessNo || t.CUSTOMNER_NO == queryTaskManageDto.BusinessNo) + .WhereIF(!string.IsNullOrEmpty(queryTaskManageDto.BusinessNo), (t, a) => t.MBL_NO == queryTaskManageDto.BusinessNo || t.CUSTOMER_NO == queryTaskManageDto.BusinessNo) .WhereIF(taskStatLevel == TaskStatLevelEnum.PUBLIC, (t, a) => t.IS_PUBLIC == 1 && t.STATUS == queryTaskManageDto.Status) .WhereIF(taskStatLevel == TaskStatLevelEnum.PERSON, (t, a) => t.IS_PUBLIC == 0 && (a.UserId == userId) // 2024-8-14 boss提出只显示自己需要审批的任务，自己创建的任务不显示，所以去掉t.CreateBy == userId || @@ -2704,7 +2704,7 @@ namespace DS.WMS.Core.TaskPlat.Method .Where(whereList) .Where((t, a) => t.STATUS != TaskStatusEnum.Cancel.ToString()) .WhereIF(taskType != null, (t, a) => t.TASK_TYPE == taskType.ToString()) - .WhereIF(!string.IsNullOrEmpty(queryTaskManageDto.BusinessNo), (t, a) => t.MBL_NO == queryTaskManageDto.BusinessNo || t.CUSTOMNER_NO == queryTaskManageDto.BusinessNo) + .WhereIF(!string.IsNullOrEmpty(queryTaskManageDto.BusinessNo), (t, a) => t.MBL_NO == queryTaskManageDto.BusinessNo || t.CUSTOMER_NO == queryTaskManageDto.BusinessNo) .WhereIF(taskStatLevel == TaskStatLevelEnum.PUBLIC, (t, a) => t.IS_PUBLIC == 1 && t.STATUS == queryTaskManageDto.Status) .WhereIF(taskStatLevel == TaskStatLevelEnum.PERSON, (t, a) => t.IS_PUBLIC == 0 && (a.UserId == userId) // 2024-8-14 boss提出只显示自己需要审批的任务，自己创建的任务不显示，所以去掉t.CreateBy == userId || From 131ca43c7fae5f07951f358ad768ecfab1aa0f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Tue, 3 Sep 2024 10:01:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/Method/InvoiceApplicationAuditService.cs | 1 - .../Properties/PublishProfiles/FolderProfile1.pubxml.user | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs index 131198e2..56f7a250 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs @@ -84,7 +84,6 @@ namespace DS.WMS.Core.Application.Method Currency = a.Currency, ApplyAmount = a.ApplyAmount, InvoiceAmount = a.InvoiceAmount, - InvoiceCurrency = a.InvoiceCurrency, CreateTime = a.CreateTime,//申请开票日期+申请时间 CreateBy = a.CreateBy, //申请人 Category = a.Category, //申请类型 diff --git a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user index c38ac47b..0b30801e 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Publish\DS8\FeeApi - True|2024-09-02T09:07:41.0268500Z||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||; + True|2024-09-03T02:01:09.7656702Z||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||; \ No newline at end of file