diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Properties/launchSettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Properties/launchSettings.json index 8341e6cc..13d6e5ef 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Properties/launchSettings.json +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Properties/launchSettings.json @@ -6,7 +6,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:44379" + "applicationUrl": "http://localhost:44378" }, "Docker": { "commandName": "Docker", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs index 0f499a4a..2bb82598 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs @@ -358,7 +358,7 @@ namespace Win.Sfs.SettleAccount var xmlapppath = Path.Combine(AppContext.BaseDirectory, "SettleAccount.Application.xml"); if (File.Exists(xmlapppath)) { - options.IncludeXmlComments(xmlapppath); + options.IncludeXmlComments(xmlapppath, true); } xmlapppath = Path.Combine(AppContext.BaseDirectory, "SettleAccount.Application.Contracts.xml"); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs index 89e94192..52a14e90 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs @@ -9,6 +9,41 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// public class BBAC_SE_DETAIL_DTO { + /// + /// 期间 + /// + public int Version { set; get; } + + /// + /// 发货时间 + /// + public DateTime ShippingDate { set; get; } + + /// + /// 发运单号 + /// + public string WmsBillNum { set; get; } + + /// + /// 零件号 + /// + public string LU { get; set; } + + /// + /// 生产号 + /// + public string PN { get; set; } + + /// + /// 组合键值(LU+PN) + /// + public string KeyCode { get; set; } + + /// + /// 数量 + /// + public decimal Qty { get; set; } + /// /// 日顺序号 /// @@ -39,6 +74,48 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// public class BBAC_SE_DETAIL_EXPORT_DTO { + /// + /// 期间 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public int Version { set; get; } + + /// + /// 发货时间 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public DateTime ShippingDate { set; get; } + + /// + /// 发运单号 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string WmsBillNum { set; get; } + + /// + /// 零件号 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string LU { get; set; } + + /// + /// 生产号 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string PN { get; set; } + + /// + /// 组合键值(LU+PN) + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string KeyCode { get; set; } + + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public decimal Qty { get; set; } + /// /// 日顺序号 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_DETAIL_Service.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_DETAIL_Service.cs index 28d20add..2f7f9e68 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_DETAIL_Service.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_DETAIL_Service.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; using Shouldly; using System; @@ -16,7 +17,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// BBAC发运单 /// - public class BBAC_SE_DETAIL_Service : ApplicationService + [AllowAnonymous] + [Route("api/settleaccount/BBAC_SE_DETAIL_SERVICE")] + public class BBAC_SE_DETAIL_SERVICE : ApplicationService { /// /// BBAC发运单仓储 @@ -24,14 +27,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ private readonly INormalEfCoreRepository _repository; /// - /// excel导入服务 + /// excel服务 /// private readonly IExcelImportAppService _excelImportService; /// /// 构造 /// - public BBAC_SE_DETAIL_Service(INormalEfCoreRepository repository, IExcelImportAppService excelImportService) + public BBAC_SE_DETAIL_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService) { _repository = repository; _excelImportService = excelImportService;