From 7cafbf5801a59e6ab92659286c9fe3c02cf81575 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 12 Jul 2023 14:17:35 +0800
Subject: [PATCH] TJ

---
 .../Properties/launchSettings.json            |  2 +-
 .../SettleAccountHttpApiHostModule.cs         |  2 +-
 .../Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs    | 77 +++++++++++++++++++
 .../Entities/BQ/BBAC_SE_DETAIL_Service.cs     | 11 ++-
 4 files changed, 86 insertions(+), 6 deletions(-)

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
     /// </summary>
     public class BBAC_SE_DETAIL_DTO
     {
+        /// <summary>
+        /// 期间
+        /// </summary>
+        public int Version { set; get; }
+
+        /// <summary>
+        /// 发货时间 
+        /// </summary>
+        public DateTime ShippingDate { set; get; }
+
+        /// <summary>
+        /// 发运单号
+        /// </summary>
+        public string WmsBillNum { set; get; }
+
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string LU { get; set; }
+
+        /// <summary>
+        /// 生产号
+        /// </summary>
+        public string PN { get; set; }
+
+        /// <summary>
+        /// 组合键值（LU+PN）
+        /// </summary>
+        public string KeyCode { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { get; set; }
+
         /// <summary>
         /// 日顺序号
         /// </summary>
@@ -39,6 +74,48 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     /// </summary>
     public class BBAC_SE_DETAIL_EXPORT_DTO
     {
+        /// <summary>
+        /// 期间
+        /// </summary>
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public int Version { set; get; }
+
+        /// <summary>
+        /// 发货时间 
+        /// </summary>
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public DateTime ShippingDate { set; get; }
+
+        /// <summary>
+        /// 发运单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public string WmsBillNum { set; get; }
+
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public string LU { get; set; }
+        
+        /// <summary>
+        /// 生产号
+        /// </summary>
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public string PN { get; set; }
+        
+        /// <summary>
+        /// 组合键值（LU+PN）
+        /// </summary>
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public string KeyCode { get; set; }
+        
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public decimal Qty { get; set; }
+
         /// <summary>
         /// 日顺序号
         /// </summary>
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
     /// <summary>
     /// BBAC发运单
     /// </summary>
-    public class BBAC_SE_DETAIL_Service : ApplicationService
+    [AllowAnonymous]
+    [Route("api/settleaccount/BBAC_SE_DETAIL_SERVICE")]
+    public class BBAC_SE_DETAIL_SERVICE : ApplicationService
     {
         /// <summary>
         /// BBAC发运单仓储
@@ -24,14 +27,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         private readonly INormalEfCoreRepository<BBAC_SE_DETAIL, Guid> _repository;
 
         /// <summary>
-        /// excel导入服务
+        /// excel服务
         /// </summary>
         private readonly IExcelImportAppService _excelImportService;
 
         /// <summary>
         /// 构造
         /// </summary>
-        public BBAC_SE_DETAIL_Service(INormalEfCoreRepository<BBAC_SE_DETAIL, Guid> repository, IExcelImportAppService excelImportService) 
+        public BBAC_SE_DETAIL_SERVICE(INormalEfCoreRepository<BBAC_SE_DETAIL, Guid> repository, IExcelImportAppService excelImportService) 
         {
             _repository = repository;
             _excelImportService = excelImportService;