diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs index 24d039b6..879b2abe 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs @@ -157,6 +157,7 @@ public class AssignmentsController : ControllerBase // } } + [Obsolete] [AllowAnonymous] [IgnoreTenant] [HttpPost("settlement/supplier/calc/{year:int}/{month:int}")] @@ -224,6 +225,11 @@ public class AssignmentsController : ControllerBase await _dbContext.InsertAsync(settlementSupplierMonthlies); } + /// + /// 录入结算金额 + /// + /// + /// //[AllowAnonymous] [Transactional] [IgnoreTenant] @@ -235,6 +241,8 @@ public class AssignmentsController : ControllerBase .Where(x => x.Valid) .FirstAsync(); + data.ThrowIfNull("未找到结算数据"); + //复制data然后修改 var newData = new SettlementSupplierMonthly { @@ -261,6 +269,11 @@ public class AssignmentsController : ControllerBase await _dbContext.InsertAsync(newData); } + /// + /// 录入退款金额 + /// + /// + /// //[AllowAnonymous] [IgnoreTenant] [HttpPost("settlement/supplier/refund")] @@ -270,6 +283,8 @@ public class AssignmentsController : ControllerBase .Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401" && x.BusinessPlaceCode == request.BusinessPlaceCode) .Where(x => x.Valid) .FirstAsync(); + + data.ThrowIfNull("未找到结算数据"); //复制data然后修改 var newData = new SettlementSupplierMonthly @@ -297,7 +312,11 @@ public class AssignmentsController : ControllerBase await _dbContext.InsertAsync(newData); } - [AllowAnonymous] + /// + /// 供应商结算报表 + /// + /// + /// [IgnoreTenant] [HttpGet("settlement/supplier/page")] public async Task> GetSettlementSupplierPageAsync([FromQuery] SettlementSupplierPageRequest request) @@ -323,6 +342,11 @@ public class AssignmentsController : ControllerBase return page; } + /// + /// 供应商结算管理 + /// + /// + /// [IgnoreTenant] [HttpGet("settlement/supplier/originPage")] public async Task> GetSettlementSupplierOriginPageAsync([FromQuery] SettlementSupplierPageRequest request) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/SettlementSupplierPageResponse.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/SettlementSupplierPageResponse.cs index 8c471730..581348a0 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/SettlementSupplierPageResponse.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/SettlementSupplierPageResponse.cs @@ -3,14 +3,20 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Response; public class SettlementSupplierPageResponse { /// - /// YYYYMM + /// 对账日期 /// public string SettleMonth { get; set; } + /// + /// 供应商名称 + /// public string SupplierName { get; set; } public Guid BusinessPlaceCode { get; set; } + /// + /// 营业点 + /// public string BusinessPlaceName { get; set; } /// @@ -43,5 +49,9 @@ public class SettlementSupplierPageResponse public string TenantId { get; set; } public int CreatedBy { get; set; } + + /// + /// 操作人 + /// public string Creator { get; set; } } \ No newline at end of file