Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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",

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");

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs

@@ -0,0 +1,148 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    /// <summary>
+    /// BBAC发运
+    /// </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>
+        [Display(Name = "日顺序号")]
+        public string SeqNumber { get; set; }
+
+        /// <summary>
+        /// 小总成号
+        /// </summary>
+        [Display(Name = "小总成号")]
+        public string AssemblyCode { get; set; }
+
+        /// <summary>
+        /// 注塑码
+        /// </summary>
+        [Display(Name = "注塑码")]
+        public string InjectionCode { get; set; }
+
+        /// <summary>
+        /// 订单时间
+        /// </summary>
+        [Display(Name = "订单时间")]
+        public DateTime BeginDate { get; set; }
+    }
+
+    /// <summary>
+    /// 导出
+    /// </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>
+        [Display(Name = "日顺序号")]
+        [ExporterHeader(DisplayName = "日顺序号")]
+        public string SeqNumber { get; set; }
+
+        /// <summary>
+        /// 小总成号
+        /// </summary>
+        [Display(Name = "小总成号")]
+        [ExporterHeader(DisplayName = "小总成号")]
+        public string AssemblyCode { get; set; }
+
+        /// <summary>
+        /// 注塑码
+        /// </summary>
+        [Display(Name = "注塑码")]
+        [ExporterHeader(DisplayName = "注塑码")]
+        public string InjectionCode { get; set; }
+
+        /// <summary>
+        /// 订单时间
+        /// </summary>
+        [Display(Name = "订单时间")]
+        [ExporterHeader(DisplayName = "订单时间")]
+        public DateTime BeginDate { get; set; }
+    }
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PURCHASE_PRICE_DTO.cs

@@ -22,6 +22,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public decimal Price { get; set; }
     }
 
+    /// <summary>
+    /// 导入
+    /// </summary>
     public class PURCHASE_PRICE_IMPORT_DTO 
     {
         /// <summary>
@@ -39,11 +42,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public decimal Price { get; set; }
     }
 
-    public class PURCHASE_PRICE_REQUEST_DTO : RequestDtoBase
-    {
-        
-    }
-
     /// <summary>
     /// 导出
     /// </summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/TB_RePartsRelationship_DTO.cs

@@ -0,0 +1,104 @@
+using Magicodes.ExporterAndImporter.Core;
+using System.ComponentModel.DataAnnotations;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    /// <summary>
+    /// 客户替换件关系
+    /// </summary>
+    public class TB_RePartsRelationship_DTO
+    {
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        [Display(Name = "零件号")]
+        public string LU { set; get; }
+
+        /// <summary>
+        /// 替换零件号
+        /// </summary>
+        [Display(Name = "替换零件号")]
+        public string RepLU { set; get; }
+
+        /// <summary>
+        /// 客户编码
+        /// </summary>
+        [Display(Name = "客户编码")]
+        public string ClientCode { set; get; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        [Display(Name = "业务类型")]
+        public string BusinessType { set; get; }
+    }
+
+    /// <summary>
+    /// 导入
+    /// </summary>
+    public class TB_RePartsRelationship_IMPORT_DTO
+    {
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        [Display(Name = "零件号")]
+        [ImporterHeader(Name = "零件号")]
+        public string LU { set; get; }
+
+        /// <summary>
+        /// 替换零件号
+        /// </summary>
+        [Display(Name = "替换零件号")]
+        [ImporterHeader(Name = "替换零件号")]
+        public string RepLU { set; get; }
+
+        /// <summary>
+        /// 客户编码
+        /// </summary>
+        [Display(Name = "客户编码")]
+        [ImporterHeader(Name = "客户编码")]
+        public string ClientCode { set; get; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        [Display(Name = "业务类型")]
+        [ImporterHeader(Name = "业务类型")]
+        public string BusinessType { set; get; }
+    }
+
+    /// <summary>
+    /// 导出
+    /// </summary>
+    public class TB_RePartsRelationship_EXPORT_DTO
+    {
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        [Display(Name = "零件号")]
+        [ExporterHeader(DisplayName = "零件号")]
+        public string LU { set; get; }
+
+        /// <summary>
+        /// 替换零件号
+        /// </summary>
+        [Display(Name = "替换零件号")]
+        [ExporterHeader(DisplayName = "替换零件号")]
+        public string RepLU { set; get; }
+
+        /// <summary>
+        /// 客户编码
+        /// </summary>
+        [Display(Name = "客户编码")]
+        [ExporterHeader(DisplayName = "客户编码")]
+        public string ClientCode { set; get; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        [Display(Name = "业务类型")]
+        [ExporterHeader(DisplayName = "业务类型")]
+        public string BusinessType { set; get; }
+    }
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/IMaterialRelationshipAppService.cs

@@ -1,22 +1,6 @@
-using System;
+namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.Shared.ApplicationBase;
-
-namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
 {
-    public interface IMaterialRelationshipAppService : ICrudAppService<MaterialRelationshipDto,
+    public interface IMaterialRelationshipAppService
-        MaterialRelationshipDto,
-        Guid,
-        MaterialRelationshipRequestDto,
-        MaterialRelationshipCreateDto,
-        MaterialRelationshipUpdateDto>,
-        IBranchBaseDataAppService<MaterialRelationshipDto, Guid>
-
     {
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/MaterialRelationshipDtoBase.cs

@@ -108,14 +108,6 @@ namespace Win.Sfs.SettleAccount.MaterialRelationships
 
 
 
-    }
-
-    /// <summary>
-    /// FIS
-    /// </summary>
-    public class MaterialRelationshipRequestDto : RequestDtoBase
-    {
-
     }
 
     /// <summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_DETAIL_Service.cs

@@ -0,0 +1,80 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Domain.BQ;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.SettleAccount.ExcelImporter;
+using Win.Sfs.Shared.RepositoryBase;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    /// <summary>
+    /// BBAC发运单
+    /// </summary>
+    [AllowAnonymous]
+    [Route("api/settleaccount/BBAC_SE_DETAIL_SERVICE")]
+    public class BBAC_SE_DETAIL_SERVICE : ApplicationService
+    {
+        /// <summary>
+        /// BBAC发运单仓储
+        /// </summary>
+        private readonly INormalEfCoreRepository<BBAC_SE_DETAIL, Guid> _repository;
+
+        /// <summary>
+        /// excel服务
+        /// </summary>
+        private readonly IExcelImportAppService _excelImportService;
+
+        /// <summary>
+        /// 构造
+        /// </summary>
+        public BBAC_SE_DETAIL_SERVICE(INormalEfCoreRepository<BBAC_SE_DETAIL, Guid> repository, IExcelImportAppService excelImportService) 
+        {
+            _repository = repository;
+            _excelImportService = excelImportService;
+        }
+
+        #region 导出
+        /// <summary>
+        /// 导出
+        /// </summary>
+        [HttpPost]
+        [Route("Export")]
+        public async Task<string> ExportAsync(RequestDto input)
+        {
+            string fileName = $"BBAC发运单_{Guid.NewGuid()}.xlsx";
+            var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
+            var dtos = ObjectMapper.Map<List<BBAC_SE_DETAIL>, List<BBAC_SE_DETAIL_EXPORT_DTO>>(entities);
+
+            ExportImporter _exportImporter = new ExportImporter();
+            var result = await _exportImporter.ExcelExporter(dtos);
+            result.ShouldNotBeNull();
+
+            await _excelImportService.SaveBlobAsync(new SaveExcelImportInputDto { Name = fileName, Content = result });
+            return fileName;
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        [HttpPost]
+        [Route("list")]
+        public async Task<PagedResultDto<BBAC_SE_DETAIL_DTO>> GetListAsync(RequestDto input)
+        {
+            var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
+            var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
+            var dtos = ObjectMapper.Map<List<BBAC_SE_DETAIL>, List<BBAC_SE_DETAIL_DTO>>(entities);
+            return new PagedResultDto<BBAC_SE_DETAIL_DTO>(totalCount, dtos);
+        }
+        #endregion
+
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PURCHASE_PRICE_SERVICE.cs

@@ -16,8 +16,6 @@ using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.Shared.DtoBase;
 using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
@@ -26,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     /// 采购价格单
     /// </summary>
     [AllowAnonymous]
-    [Route("api/settleaccount/PURCHASE_PRICE_SERVICE")]
+    [Route("api/settleaccount/PURCHASE_PRICE_LIST_Service")]
     public class PURCHASE_PRICE_SERVICE : SettleAccountApplicationBase<PURCHASE_PRICE>
     {
         /// <summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs

@@ -0,0 +1,129 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Domain.BQ;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Caching;
+using Win.Abp.Snowflakes;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.CommonManagers;
+using Win.Sfs.SettleAccount.Constant;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.SettleAccount.ExcelImporter;
+using Win.Sfs.SettleAccount.ExportReports;
+using Win.Sfs.Shared.RepositoryBase;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    /// <summary>
+    /// 客户替换件关系
+    /// </summary>
+    [AllowAnonymous]
+    [Route("api/settleaccount/TB_RePartsRelationship_SERVICE")]
+    public class TB_RePartsRelationship_SERVICE : SettleAccountApplicationBase<TB_RePartsRelationship>
+    {
+        /// <summary>
+        /// 客户替换件关系仓储
+        /// </summary>
+        private readonly INormalEfCoreRepository<TB_RePartsRelationship, Guid> _repository;
+
+        public TB_RePartsRelationship_SERVICE(
+            INormalEfCoreRepository<TB_RePartsRelationship, Guid> repository,
+            IDistributedCache<TB_RePartsRelationship> cache,
+            IExcelImportAppService excelImportService,
+            ISnowflakeIdGenerator snowflakeIdGenerator,
+            ICommonManager commonManager
+        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
+        {
+            _repository = repository;
+        }
+
+        #region 导入、导出
+        /// <summary>
+        /// 导入
+        /// </summary>
+        [HttpPost]
+        [Route("Import")]
+        public async Task<string> ImportAsync([FromForm] IFormFileCollection files)
+        {
+            ExportImporter _exportImporter = new ExportImporter();
+            var result = await _exportImporter.UploadExcelImport<TB_RePartsRelationship_IMPORT_DTO>(files, _excelImportService);
+            var _ls = ObjectMapper.Map<List<TB_RePartsRelationship_IMPORT_DTO>, List<TB_RePartsRelationship>>(result);
+            List<string> _errorList = new List<string>();
+            var checkList = new List<ErrorExportDto>();
+
+            if (_ls.Count > 0)
+            {
+                var query = from arc in _ls
+                            group arc by new { arc.LU }
+                            into g
+                            where g.Count() > 1
+
+                            select g;
+                foreach (var itm in query)
+                {
+                    checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("物料号{0}有重复", itm.Key.LU), string.Empty));
+                }
+            }
+            foreach (var itm in _ls)
+            {
+                var _first = _repository.FirstOrDefault(p => p.LU == itm.LU);
+                if (_first != null)
+                {
+                    _first.Update(itm.LU, itm.RepLU, itm.ClientCode, itm.BusinessType);
+                    await _repository.UpdateAsync(_first);
+                }
+                else
+                {
+                    await _repository.InsertAsync(itm);
+                }
+            }
+            if (checkList.Count > 0)
+            {
+                return await ExportErrorReportAsync(checkList);
+            }
+            return ApplicationConsts.SuccessStr;
+        }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        [HttpPost]
+        [Route("Export")]
+        public async Task<string> ExportAsync(RequestDto input)
+        {
+            string fileName = $"客户替换件关系_{Guid.NewGuid()}.xlsx";
+            var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
+            var dtos = ObjectMapper.Map<List<TB_RePartsRelationship>, List<TB_RePartsRelationship_EXPORT_DTO>>(entities);
+
+            ExportImporter _exportImporter = new ExportImporter();
+            var result = await _exportImporter.ExcelExporter(dtos);
+            result.ShouldNotBeNull();
+
+            await _excelImportService.SaveBlobAsync(new SaveExcelImportInputDto { Name = fileName, Content = result });
+            return fileName;
+        }
+        #endregion
+
+        #region CURD
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        [HttpPost]
+        [Route("list")]
+        public async Task<PagedResultDto<TB_RePartsRelationship_DTO>> GetListAsync(RequestDto input)
+        {
+            var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
+            var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
+            var dtos = ObjectMapper.Map<List<TB_RePartsRelationship>, List<TB_RePartsRelationship_DTO>>(entities);
+            return new PagedResultDto<TB_RePartsRelationship_DTO>(totalCount, dtos);
+        }
+        #endregion
+
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs

@@ -1,50 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Distributed;
 using Shouldly;
-using Volo.Abp;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Guids;
 using Volo.Abp.ObjectMapping;
-using Volo.Abp.Uow;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.Boms;
-using Win.Sfs.SettleAccount.Entities.Controls;
 using Win.Sfs.SettleAccount.Entities.ImportMap;
 using Win.Sfs.SettleAccount.Entities.Materials;
 using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.Shared.CacheBase;
-using Win.Sfs.Shared.Filter;
 using Win.Sfs.Shared.RepositoryBase;
-using Win.Utils;
 
 namespace Win.Sfs.SettleAccount.Boms
 {
-
     /// <summary>
     /// BOM
     /// </summary>
-    //[Authorize(SettleAccountPermissions.Boms.Default)]
     [AllowAnonymous]
-    [Route("api/settleaccount/bom")]
+    [Route("api/settleaccount/BomAppService")]
     public class BomAppService : SettleAccountApplicationBase<Bom>
     {
         /// <summary>
@@ -52,46 +31,21 @@ namespace Win.Sfs.SettleAccount.Boms
         /// </summary>
         private readonly INormalEfCoreRepository<Bom, Guid> _repository;
 
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IObjectMapper _objectMapper;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<Material, Guid> _materialRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> _importColumnMapRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<BomVersion, Guid> _versionRepository;
-
         /// <summary>
-        /// ¹¹Ôì·½·¨
+        /// ¹¹Ôì
         /// </summary>
         public BomAppService(
             INormalEfCoreRepository<Bom, Guid> repository,
-        IGuidGenerator guidGenerator,
+            IDistributedCache<Bom> cache,
-           IObjectMapper objectMapper,
+            IExcelImportAppService excelImportService,
-           IExcelImportAppService excelImportService,
+            ISnowflakeIdGenerator snowflakeIdGenerator,
-           ISnowflakeIdGenerator snowflakeIdGenerator,
+            ICommonManager commonManager
-           ICommonManager commonManager,
+            ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
-           ISettleAccountBranchEfCoreRepository<BomVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<Material, Guid> materialRepository,
-           ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> importColumnMapRepository,
-           IDistributedCache<Bom> cache
-        ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
         {
             _repository = repository;
-
-            _guidGenerator = guidGenerator;
-            _objectMapper = objectMapper;
-            
-            _excelImportService = excelImportService;
-            _versionRepository = versionRepository;
-            _materialRepository = materialRepository;
-            _importColumnMapRepository = importColumnMapRepository;
         }
 
-        #region µ¼Èë¡¢µ¼³ö
+        #region µ¼³ö
         /// <summary>
         /// µ¼³ö
         /// </summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs

@@ -1,42 +1,22 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EFCore.BulkExtensions;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Distributed;
 using Shouldly;
-using Volo.Abp;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Volo.Abp.ObjectMapping;
-using Volo.Abp.Uow;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.CodeSettings;
-using Win.Sfs.SettleAccount.Entities.ImportMap;
-using Win.Sfs.SettleAccount.Entities.Materials;
 using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.Shared.CacheBase;
 using Win.Sfs.Shared.RepositoryBase;
-using Win.Utils;
 
 namespace Win.Sfs.SettleAccount.Entities.Controls
 {
     /// <summary>
     /// 期间设置
     /// </summary>
-    //[Authorize(SettleAccountPermissions.CentralizedControls.Default)]
     [AllowAnonymous]
     [Route("api/settleaccount/CentralizedControl")]
     public class CentralizedControlAppService : SettleAccountApplicationBase<CentralizedControl>
@@ -46,16 +26,11 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
         /// </summary>
         private readonly INormalEfCoreRepository<CentralizedControl, Guid> _repository;
 
-        private readonly ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> _mapRepository;
-
-        private readonly IExcelImportAppService _excelImportService;
         /// <summary>
-        /// 构建方法
+        /// 构造
         /// </summary>
         public CentralizedControlAppService(
             INormalEfCoreRepository<CentralizedControl, Guid> repository,
-            IGuidGenerator guidGenerator,
-           IObjectMapper objectMapper,
             IDistributedCache<CentralizedControl> cache,
             IExcelImportAppService excelImportService,
             ISnowflakeIdGenerator snowflakeIdGenerator,
@@ -63,10 +38,9 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
         ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
         {
             _repository = repository;
-            _excelImportService = excelImportService;
         }
 
-        #region 导入、导出
+        #region 导出
         /// <summary>
         /// 导出
         /// </summary>
@@ -103,6 +77,9 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
         #endregion
 
         #region 开启、关闭
+        /// <summary>
+        /// 开启版本
+        /// </summary>
         [HttpPost]
         [Route("open")]
         public async Task<bool> OpenVersion(List<Guid> ids)
@@ -115,11 +92,11 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
             return true;
         }
 
-        [HttpPost]
-        [Route("close")]
         /// <summary>
         /// 关闭版本
         /// </summary>
+        [HttpPost]
+        [Route("close")]
         public async Task<bool> ClosedVersion(List<Guid> ids)
         {
             var entitys = await _repository.GetListAsync(p => ids.Contains(p.Id));

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs

@@ -47,6 +47,7 @@ namespace Win.Sfs.SettleAccount.ERPShippingDetails
     [Authorize(SettleAccountPermissions.Boms.Default)]
     //[AllowAnonymous]
     [Route("api/settleaccount/ErpShipping")]
+    [ApiExplorerSettings(IgnoreApi = true)]
     public class ErpShippingAppService : SettleAccountApplicationBase<ERPShippingDetail>
     {
         private readonly IGuidGenerator _guidGenerator;

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs

@@ -45,6 +45,7 @@ namespace Win.Sfs.SettleAccount.Entities.ErrorBills
     // [Authorize(SettleAccountPermissions.ErrorBills.Default)]
     //[AllowAnonymous]
     [Route("api/settleaccount/ErrorBill")]
+    [ApiExplorerSettings(IgnoreApi = true)]
     public class ErrorBillAppService : SettleAccountApplicationBase<ErrorBill>
     {
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs

@@ -44,6 +44,7 @@ namespace Win.Sfs.SettleAccount.FISes
     /// </summary>
     //[Authorize(SettleAccountPermissions.FISs.Default)]
     //[AllowAnonymous]
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Route("api/settleaccount/fis")]
     public class FISAppService : SettleAccountApplicationBase<FIS>, IFISAppService
     {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Factories/FactoryAppService.cs

@@ -32,7 +32,8 @@ namespace Win.Sfs.SettleAccount.Entities.Factories
     /// <summary>
     /// 区域相关应用服务
     /// </summary>
-   [Authorize(SettleAccountPermissions.Factorys.Default)]
+    [ApiExplorerSettings(IgnoreApi = true)]
+    [Authorize(SettleAccountPermissions.Factorys.Default)]
     //[AllowAnonymous]
     [Route("api/settleaccount/Factory")]
     public class FactoryAppService : SettleAccountApplicationBase<Factory>, IFactoryAppService

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Inventories/InventoryDetailAppService.cs

@@ -38,6 +38,7 @@ namespace Win.Sfs.SettleAccount.InventoryDetails
     /// <summary>
     /// 区域相关应用服务
     /// </summary>
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Authorize(SettleAccountPermissions.InventoryDetails.Default)]
 
     [Route("api/settleaccount/InventoryDetail")]

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Invoices/InvoiceAppService.cs

@@ -41,6 +41,7 @@ namespace Win.Sfs.SettleAccount.Entities.Invoices
     /// <summary>
     /// 发票汇总导入
     /// </summary>
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Route("api/settleaccount/Invoices")]
     [Authorize(SettleAccountPermissions.Invoices.Default)]
     public class InvoiceAppService : SettleAccountApplicationBase<Invoice>,IInvoiceAppService

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs

@@ -48,6 +48,7 @@ namespace Win.Sfs.SettleAccount.ItemInvoicePrices
     /// </summary>
     //[Authorize(SettleAccountPermissions.ItemInvoicePrices.Default)]
     //[AllowAnonymous]
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Route("api/settleaccount/ItemInvoicePrice")]
     public class ItemInvoicePriceAppService : SettleAccountApplicationBase<ItemInvoicePrice>, IItemInvoicePriceAppService
     {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs

@@ -29,6 +29,7 @@ using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.SettleAccount.MaterialRelationships;
 using Win.Sfs.Shared.CacheBase;
+using Win.Sfs.Shared.DtoBase;
 using Win.Sfs.Shared.RepositoryBase;
 using Win.Utils;
 
@@ -37,9 +38,8 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
     /// <summary>
     /// 客户零件关系
     /// </summary>
-    //[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
     [AllowAnonymous]
-    [Route("api/settleaccount/MaterialRelationship")]
+    [Route("api/settleaccount/MaterialRelationshipAppService")]
     public class MaterialRelationshipAppService : SettleAccountApplicationBase<MaterialRelationship>
     {
         /// <summary>
@@ -47,17 +47,11 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
         /// </summary>
         private readonly INormalEfCoreRepository<MaterialRelationship, Guid> _repository;
 
-        private readonly ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> _mapRepository;
-        private readonly IExcelImportAppService _excelImportService;
-
         /// <summary>
-        /// 构造方法
+        /// 构造
         /// </summary>
         public MaterialRelationshipAppService(
             INormalEfCoreRepository<MaterialRelationship, Guid> repository,
-            IGuidGenerator guidGenerator,
-            IObjectMapper objectMapper,
-            ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> mapRepository,
             IDistributedCache<MaterialRelationship> cache,
             IExcelImportAppService excelImportService,
             ISnowflakeIdGenerator snowflakeIdGenerator,
@@ -65,9 +59,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
         ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
         {
             _repository = repository;
-
-            _mapRepository = mapRepository;
-            _excelImportService = excelImportService;
         }
 
         #region 导入、导出
@@ -122,7 +113,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
         /// </summary>
         [HttpPost]
         [Route("Export")]
-        public async Task<string> ExportAsync(MaterialRelationshipRequestDto input)
+        public async Task<string> ExportAsync(RequestDtoBase input)
         {
             string fileName = $"客户零件关系_{Guid.NewGuid()}.xlsx";
             var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
@@ -143,7 +134,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
         /// </summary>
         [HttpPost]
         [Route("list")]
-        public async Task<PagedResultDto<MaterialRelationshipDto>> GetListAsync(MaterialRelationshipRequestDto input)
+        public async Task<PagedResultDto<MaterialRelationshipDto>> GetListAsync(RequestDtoBase input)
         {
             var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
             var totalCount = await _repository.GetCountByFilterAsync(input.Filters);

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs

@@ -30,6 +30,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
     //[AllowAnonymous]
 
     //[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Route("api/settleaccount/MaterialRelationshipDetail")]
     public class MaterialRelationshipTHAppService : ApplicationService
     /*, IMaterialRelationshipTHAppService*/

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs

@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Shouldly;
 using System;
 using System.Collections.Generic;
@@ -10,16 +8,8 @@ using Volo.Abp.Application.Dtos;
 using Volo.Abp.Caching;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.Boms;
 using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.Boms;
-using Win.Sfs.SettleAccount.Entities.ImportMap;
-using Win.Sfs.SettleAccount.Entities.Prices;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.MaterialRelationships;
 using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.Materials
@@ -27,50 +17,27 @@ namespace Win.Sfs.SettleAccount.Entities.Materials
     /// <summary>
     /// 物料主数据
     /// </summary>
-    //[Authorize(SettleAccountPermissions.Materials.Default)]
     [AllowAnonymous]
-    [Route("api/settleaccount/Material")]
+    [Route("api/settleaccount/MaterialAppService")]
     public class MaterialAppService : SettleAccountApplicationBase<Material>
     {
-        private readonly IExcelImportAppService _excelImportService;
+        /// <summary>
+        /// 物料主数据仓储
+        /// </summary>
         private readonly INormalEfCoreRepository<Material, Guid> _repository;
 
-        private readonly ISettleAccountBranchEfCoreRepository<Bom, Guid> _bomRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<BomVersion, Guid> _bomversionRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<PriceList, Guid> _priceRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<PriceListVersion, Guid> _priceversionRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> _mapRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> _relationshipRepository;
-
         /// <summary>
-        /// 构建方法
+        /// 构造
         /// </summary>
         public MaterialAppService(
             INormalEfCoreRepository<Material, Guid> repository,
-                ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> mapRepository,
+            IDistributedCache<Material> cache,
-                ISettleAccountBranchEfCoreRepository<Bom, Guid> bomRepository,
-                 ISettleAccountBranchEfCoreRepository<BomVersion, Guid> bomversionRepository,
-        TaskJobService service,
-        ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> relationshipRepository,
-        ISettleAccountBranchEfCoreRepository<PriceList, Guid> priceRepository,
-        ISettleAccountBranchEfCoreRepository<PriceListVersion, Guid> priceversionRepository,
-
-        IDistributedCache<Material> cache,
             IExcelImportAppService excelImportService,
             ISnowflakeIdGenerator snowflakeIdGenerator,
             ICommonManager commonManager
-       
+            ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
-        ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
         {
-            _priceRepository = priceRepository;
+            _repository = repository;     
-            _priceversionRepository = priceversionRepository;
-            _bomRepository = bomRepository;
-            _excelImportService = excelImportService;
-            _repository = repository;
-            _relationshipRepository = relationshipRepository;
-            _mapRepository = mapRepository;
-            _bomversionRepository = bomversionRepository;
-           
         }
 
         #region 导入、导出
@@ -79,7 +46,6 @@ namespace Win.Sfs.SettleAccount.Entities.Materials
         /// </summary>
         [HttpPost]
         [Route("Export")]
-        //[Authorize(SettleAccountPermissions.Materials.Default)]
         public virtual async Task<string> ExportAsync(MaterialRequestDto input)
         {
             string _fileName = string.Format("物料主数据_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd"));
@@ -112,7 +78,6 @@ namespace Win.Sfs.SettleAccount.Entities.Materials
         /// </summary>
         [HttpPost]
         [Route("list")]
-        //[Authorize(SettleAccountPermissions.Materials.Default)]
         virtual public async Task<PagedResultDto<MaterialDto>> GetListAsync(MaterialRequestDto input)
         {
             var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount,

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs

@@ -37,6 +37,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
     /// 区域相关应用服务
     /// </summary>
     //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
+    [ApiExplorerSettings(IgnoreApi = true)]
     [AllowAnonymous]
     [Route("api/settleaccount/Prebatch")]
     public class PrebatchAppService : SettleAccountApplicationBase<Prebatch>, IPrebatchAppService

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs

@@ -4,36 +4,26 @@ using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Extensions;
-using NPOI.SS.UserModel;
-using SettleAccount.Job.Services.Report;
 using Shouldly;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using System.Threading.Tasks;
-using TaskJob.EventArgs;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
-using Volo.Abp.Uow;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Constant;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.Entities.ImportMap;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.Prices
 {
     /// <summary>
-    /// 标准价格单-相关应用服务
+    /// 销售价格单
     /// </summary>
-    //[Authorize(SettleAccountPermissions.PriceLists.Default)]
+    [Route("api/SettleAccount/TB_PRICE_LIST_Service")]
-    [Route("api/SettleAccount/PriceList")]
     [AllowAnonymous]
     public class PriceListAppService : ApplicationService
     {
@@ -55,15 +45,15 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         }
 
         #region 导入、导出
-        /// <summary>
+        ///// <summary>
-        /// 获取导入模板
+        ///// 获取导入模板
-        /// </summary>
+        ///// </summary>
-        [HttpPost("import-template")]
+        //[HttpPost("import-template")]
-        public virtual async Task<IActionResult> ImportTemplateAsync()
+        //public virtual async Task<IActionResult> ImportTemplateAsync()
-        {
+        //{
-            await Task.CompletedTask;
+        //    await Task.CompletedTask;
-            return new Microsoft.AspNetCore.Mvc.OkResult();
+        //    return new Microsoft.AspNetCore.Mvc.OkResult();
-        }
+        //}
 
         /// <summary>
         /// 导入
@@ -100,7 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         /// </summary>
         [HttpPost]
         [Route("Export")]
-        public virtual async Task<string> ExportAsync(TB_PRICE_LIST_RequestDto input)
+        public virtual async Task<string> ExportAsync(RequestDto input)
         {
             IExporter _csv = new CsvExporter();
 
@@ -115,18 +105,8 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
             string _fileName = string.Empty;
             //声明导出容器
 
-            byte[] result = null;
+            _fileName = string.Format("销售价格单_{0}.xlsx", Guid.NewGuid().ToString());
-            switch (input.FileType)
+            byte[] result = await _excel.ExportAsByteArray(dtoDetails);
-            {
-                case 0:
-                    _fileName = string.Format("销售价格单_{0}.xlsx", Guid.NewGuid().ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("销售价格单_{0}.xlsx", Guid.NewGuid().ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
             result.ShouldNotBeNull();
 
             //保存导出文件到服务器存成二进制
@@ -147,12 +127,8 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         /// </summary>
         [HttpPost]
         [Route("list")]
-        public virtual async Task<PagedResultDto<TB_PRICE_LISTDto>> GetListAsync(TB_PRICE_LIST_RequestDto input)
+        public virtual async Task<PagedResultDto<TB_PRICE_LISTDto>> GetListAsync(RequestDto input)
         {
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
             var entitys = await _priceListManager.GetListAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount);
             var totalCount = await _priceListManager.GetCountAsync(input.Filters, GuidGenerator.Create());
             var dtos = ObjectMapper.Map<List<PriceList>, List<TB_PRICE_LISTDto>>(entitys);

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs

@@ -1,14 +1,18 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Shouldly;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Caching;
+using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.Bases;
+using Win.Sfs.SettleAccount.CommonManagers;
 using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.ImportMap;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.Shared.RepositoryBase;
 
@@ -17,29 +21,24 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
     /// <summary>
     /// 备件价格
     /// </summary>
-    //[Authorize(SettleAccountPermissions.PriceLists.Default)]
     [AllowAnonymous]
-    [Route("api/SettleAccount/PriceListBJ")]
+    [Route("api/SettleAccount/TB_PRICE_BJ_Service")]
-    public class PriceListAppServiceBJ : CurdBaseAppService<PriceListBJ, PriceListBJDto, PriceListBJRequestDto, PriceListBJ, PriceListBJImportDto, PriceListBJExportDto>
+    public class PriceListAppServiceBJ : SettleAccountApplicationBase<PriceListBJ>
     {
         private readonly INormalEfCoreRepository<PriceListBJ, Guid> _repository;
         private readonly PriceListManagerBJ _priceListManagerBJ;
-        private readonly IExcelImportAppService _excelImportService;
-        private readonly ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> _mapRepository;
 
         public PriceListAppServiceBJ(
             INormalEfCoreRepository<PriceListBJ, Guid> repository,
             PriceListManagerBJ priceListManagerBJ,
+            IDistributedCache<PriceListBJ> cache,
             IExcelImportAppService excelImportService,
-           ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> mapRepository
+            ISnowflakeIdGenerator snowflakeIdGenerator,
-
+            ICommonManager commonManager
-           ) :base(repository: repository, excelImportService: excelImportService)
+        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
         {
             _repository = repository;
             _priceListManagerBJ = priceListManagerBJ;
-            _excelImportService = excelImportService;
-
-            _mapRepository = mapRepository;
         }
 
         #region 导入、导出
@@ -48,7 +47,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         /// </summary>
         [HttpPost]
         [Route("Import")]
-        public override async Task<string> ImportAsync([FromForm] IFormFileCollection files, string version)
+        public async Task<string> ImportAsync([FromForm] IFormFileCollection files, string version)
         {
             ExportImporter _exportImporter = new ExportImporter();
             var result = await _exportImporter.UploadExcelImport<PriceListBJImportDto>(files, _excelImportService);
@@ -68,6 +67,40 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
             await _priceListManagerBJ.ImportAsync(_ls.ToList(), version);
             return ApplicationConsts.SuccessStr;
         }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        [HttpPost]
+        [Route("Export")]
+        public async Task<string> ExportAsync(RequestDto input)
+        {
+            string fileName = $"备件价格_{Guid.NewGuid()}.xlsx";
+            var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
+            var dtos = ObjectMapper.Map<List<PriceListBJ>, List<PriceListBJExportDto>>(entities);
+
+            ExportImporter _exportImporter = new ExportImporter();
+            var result = await _exportImporter.ExcelExporter(dtos);
+            result.ShouldNotBeNull();
+
+            await _excelImportService.SaveBlobAsync(new SaveExcelImportInputDto { Name = fileName, Content = result });
+            return fileName;
+        }
+        #endregion
+
+        #region CURD
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        [HttpPost]
+        [Route("list")]
+        public async Task<PagedResultDto<PriceListBJDto>> GetListAsync(RequestDto input)
+        {
+            var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
+            var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
+            var dtos = ObjectMapper.Map<List<PriceListBJ>, List<PriceListBJDto>>(entities);
+            return new PagedResultDto<PriceListBJDto>(totalCount, dtos);
+        }
         #endregion
 
         #region 原有的方法之后废弃删除

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs

@@ -36,6 +36,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch
     /// <summary>
     /// 总成与结算件关系
     /// </summary>
+    [ApiExplorerSettings(IgnoreApi = true)]
     [AllowAnonymous]
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs

@@ -51,6 +51,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// <summary>
     /// 大众准时化结算明细导入-R3已结
     /// </summary>
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Authorize(SettleAccountPermissions.SettleAccounts.Default)]
     //[AllowAnonymous]
     [Route("api/settleaccount/SettleAccount")]

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs

@@ -40,6 +40,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettlementParts
     /// </summary>
     //[Authorize(SettleAccountPermissions.SettlementParts.Default)]
     //[AllowAnonymous]
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Route("api/settleaccount/SettlementPart")]
     public class SettlementPartAppService : SettleAccountApplicationBase<SettlementPart>, ISettlementPartAppService
     {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnHQSettleAccounts/UnHQSettleAppService.cs

@@ -29,6 +29,7 @@ namespace Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts
     /// <summary>
     /// 红旗主机场明细导入
     /// </summary>
+    [ApiExplorerSettings(IgnoreApi = true)]
     [Authorize(SettleAccountPermissions.HQ_HPlatform.Default)]
     //[AllowAnonymous]
     [Route("api/settleaccount/UnHQSettle")]

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -135,6 +135,8 @@ namespace Win.Sfs.SettleAccount
             #endregion
 
             CreateMapPURCHASE_PRICE();
+            CreateMapTB_RePartsRelationship();
+            CreateMapBBAC_SE_DETAIL();
         }
         #region 北汽
 
@@ -746,5 +748,24 @@ namespace Win.Sfs.SettleAccount
             CreateMap<PURCHASE_PRICE_IMPORT_DTO, PURCHASE_PRICE>();
         }
 
+        /// <summary>
+        /// 客户替换件关系
+        /// </summary>
+        private void CreateMapTB_RePartsRelationship()
+        {
+            CreateMap<TB_RePartsRelationship, TB_RePartsRelationship_DTO>();
+            CreateMap<TB_RePartsRelationship, TB_RePartsRelationship_EXPORT_DTO>();
+            CreateMap<TB_RePartsRelationship_IMPORT_DTO, TB_RePartsRelationship>();
+        }
+
+        /// <summary>
+        /// BBAC发运单
+        /// </summary>
+        private void CreateMapBBAC_SE_DETAIL()
+        {
+            CreateMap<BBAC_SE_DETAIL, BBAC_SE_DETAIL_DTO>();
+            CreateMap<BBAC_SE_DETAIL, BBAC_SE_DETAIL_EXPORT_DTO>();
+        }
+
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs

@@ -1,12 +1,12 @@
-using System.ComponentModel.DataAnnotations;
+using System;
-
+using System.ComponentModel.DataAnnotations;
-
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace SettleAccount.Domain.BQ;
 
 
 [Display(Name = "客户替换件关系")]
-public class TB_RePartsRelationship
+public class TB_RePartsRelationship : FullAuditedAggregateRoot<Guid>
 {
     /// <summary>
     /// 取值字段【零件号】
@@ -32,4 +32,13 @@ public class TB_RePartsRelationship
         ClientCode = clientCode;
         BusinessType = businessType;
     }
+
+    public void Update(string lU, string repLU, string clientCode, string businessType) 
+    {
+        LU = lU;
+        RepLU = repLU;
+        ClientCode = clientCode;
+        BusinessType = businessType;
+    }
+
 }

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -82,6 +82,8 @@ namespace Win.Sfs.SettleAccount
             builder.ConfigureCentralizedControl(options);
             //采购价格单
             builder.ConfigurePURCHASE_PRICE(options);
+            //客户替换件关系
+            builder.ConfigureTB_RePartsRelationship(options);
             #endregion
 
 
@@ -335,21 +337,34 @@ namespace Win.Sfs.SettleAccount
                 b.ConfigureByConvention();
             });
         }
+
+
+        /// <summary>
+        /// 客户替换件关系
+        /// </summary>
+        private static void ConfigureTB_RePartsRelationship(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+            builder.Entity<TB_RePartsRelationship>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_TB_RePartsRelationship", options.Schema);
+                b.ConfigureByConvention();
+            });
+        }
         #endregion
 
 
 
-     
+
 
 
         #region 北汽
 
 
 
-      
 
 
-      
+
+
 
         /// <summary>
         /// 一汽轿车平台验收结算明细-导入

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230712032712_20230712-1.cs

@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202307121 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Set_TB_RePartsRelationship",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    LU = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RepLU = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ClientCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    BusinessType = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Set_TB_RePartsRelationship", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Set_TB_RePartsRelationship");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@@ -2995,6 +2995,69 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.ToTable("Set_PURCHASE_PRICE");
                 });
 
+            modelBuilder.Entity("SettleAccount.Domain.BQ.TB_RePartsRelationship", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("BusinessType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClientCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("LU")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RepLU")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Set_TB_RePartsRelationship");
+                });
+
             modelBuilder.Entity("Win.Sfs.SettleAccount.Boms.Bom", b =>
                 {
                     b.Property<Guid>("Id")

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs

@@ -44,4 +44,5 @@ public class BBAC_PD_DETAILController : GenericController<BBAC_PD_DETAIL, BBAC_P
     {
         return null;
     }
+
 }

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs

@@ -33,10 +33,6 @@ public class BBAC_SE_DETAILController : GenericController<BBAC_SE_DETAIL, BBAC_S
         return base.Create(model);
     }
 
-    /// <summary>
-    /// 未确定
-    /// </summary>
-    /// <returns></returns>
     [HttpPost, Display(Name = "同步"), Multiple]
     public IActionResult? Synchronous()
     {

docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs

@@ -38,7 +38,7 @@ public class CentralizedControlController : GenericController<CentralizedControl
         return null;
     }
 
-    [HttpPost,Multiple,Display(Name ="开启期间")]
+    [HttpPost, Multiple, Display(Name = "开启期间")]
     public IActionResult? OpenVersion()
     {
         return null;

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs

@@ -16,9 +16,9 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
     }
 
     [NonAction]
-    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
     {
-        return base.Import(importexcelfile);
+        return base.Import(file);
     }
 
     [NonAction]
@@ -33,10 +33,6 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
         return base.Create(model);
     }
 
-    /// <summary>
-    /// 未确定
-    /// </summary>
-    /// <returns></returns>
     [HttpPost, Display(Name = "同步"), Multiple]
     public IActionResult? Synchronous()
     {

docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs

@@ -46,8 +46,8 @@ public class INVOICE_GRPController : GenericController<INVOICE_GRP, INVOICE_GRP,
         return null;
     }
 
-    [HttpPost, Display(Name = "审核发票信息"), Multiple]
+    [HttpPost, Display(Name = "审核通过"), Multiple]
-    public IActionResult? AddBackGroundJob()
+    public IActionResult? ApprovalPassed()
     {
         return null;
     }

docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SAController.cs

@@ -69,4 +69,16 @@ public class JIT_PUB_SAController : BaseController, IResourceService<JIT_PUB_SA>
 [Order(1)]
 public class JIT_PUB_SA : IResource
 {
+    [Display(Name = "期间")]
+    public string Version { get; set; } = null!;
+
+    [Display(Name = "结算单据")]
+    [OneToMany<PUB_SA_DETAIL>]
+    public string BillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; } = null!;
 }

docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs

@@ -11,78 +11,23 @@ IEntityTypeConfiguration<MaterialRelationship>,
 IEntityTypeConfiguration<TB_RePartsRelationship>,
 IEntityTypeConfiguration<CentralizedControl>,
 IEntityTypeConfiguration<TB_PRICE_LIST>,
-//IEntityTypeConfiguration<Class7>,
-//IEntityTypeConfiguration<Class8>,
 IEntityTypeConfiguration<HBPO_SA>,
 IEntityTypeConfiguration<BBAC_SA>,
 IEntityTypeConfiguration<HBPO_SE_DETAIL>,
 IEntityTypeConfiguration<BBAC_SE_DETAIL>,
-//IEntityTypeConfiguration<Class13>,
-//IEntityTypeConfiguration<Class14>,
-//IEntityTypeConfiguration<Class15>,
-//IEntityTypeConfiguration<Class16>,
-//IEntityTypeConfiguration<Class17>,
-//IEntityTypeConfiguration<Class18>,
-//IEntityTypeConfiguration<JIT_SA>,
-//IEntityTypeConfiguration<JIT_SE_DETAIL>,
-//IEntityTypeConfiguration<Class21>,
-//IEntityTypeConfiguration<Class22>,
-//IEntityTypeConfiguration<Class23>,
-//IEntityTypeConfiguration<BJ_SE_DETAIL>,
-//IEntityTypeConfiguration<Class26>,
-//IEntityTypeConfiguration<Class27>,
-//IEntityTypeConfiguration<Class28>,
-//IEntityTypeConfiguration<Class29>,
-//IEntityTypeConfiguration<IN_SE_DETAIL>,
-//IEntityTypeConfiguration<Class32>,
-//IEntityTypeConfiguration<Class33>,
-//IEntityTypeConfiguration<Class34>,
-//IEntityTypeConfiguration<Class35>,
-//IEntityTypeConfiguration<HBPO_DN>,
-//IEntityTypeConfiguration<BBAC_DN>,
-//IEntityTypeConfiguration<JIT_DN>,
-//IEntityTypeConfiguration<BJ_DN>,
-//IEntityTypeConfiguration<IN_DN>,
-//IEntityTypeConfiguration<Class41>,
 IEntityTypeConfiguration<INVOICE_GRP>,
-//IEntityTypeConfiguration<Class43>,
-//IEntityTypeConfiguration<Class44>,
-//IEntityTypeConfiguration<Class45>,
-//IEntityTypeConfiguration<Class46>,
-//IEntityTypeConfiguration<Class47>,
-//IEntityTypeConfiguration<BBAC_DN_DETAIL>,
 IEntityTypeConfiguration<BBAC_SA_DETAIL>,
-//IEntityTypeConfiguration<BJ_DN_DETAIL>,
-//IEntityTypeConfiguration<HBPO_DN_DETAIL>,
 IEntityTypeConfiguration<HBPO_SA_DETAIL>,
-//IEntityTypeConfiguration<IN_DN_DETAIL>,
-//IEntityTypeConfiguration<JIT_DN_DETAIL>,
-//IEntityTypeConfiguration<JIT_SA_DETAIL>,
 IEntityTypeConfiguration<TB_PRICE_BJ>,
 IEntityTypeConfiguration<INVOICE_WAIT_DETAIL>,
-//IEntityTypeConfiguration<HBPO_NOT_SA>,
 IEntityTypeConfiguration<HBPO_NOT_SA_DETAIL>,
-//IEntityTypeConfiguration<BBAC_NOT_SA>,
 IEntityTypeConfiguration<BBAC_NOT_SA_DETAIL>,
-//IEntityTypeConfiguration<JIT_NOT_SA>,
-//IEntityTypeConfiguration<JIT_NOT_SA_DETAIL>,
-//IEntityTypeConfiguration<BJ_NOT_SA>,
-//IEntityTypeConfiguration<BJ_NOT_SA_DETAIL>,
-//IEntityTypeConfiguration<IN_NOT_SA>,
-//IEntityTypeConfiguration<IN_NOT_SA_DETAIL>,
 IEntityTypeConfiguration<HBPO_CAN_SA>,
 IEntityTypeConfiguration<HBPO_CAN_SA_DETAIL>,
 IEntityTypeConfiguration<BBAC_CAN_SA>,
 IEntityTypeConfiguration<BBAC_CAN_SA_DETAIL>,
-//IEntityTypeConfiguration<JIT_CAN_SA>,
-//IEntityTypeConfiguration<JIT_CAN_SA_DETAIL>,
-//IEntityTypeConfiguration<BJ_CAN_SA>,
-//IEntityTypeConfiguration<BJ_CAN_SA_DETAIL>,
-//IEntityTypeConfiguration<IN_CAN_SA>,
-//IEntityTypeConfiguration<IN_CAN_SA_DETAIL>,
 IEntityTypeConfiguration<INVOICE_MAP_GROUP>,
 IEntityTypeConfiguration<INVOICE_NOT_SETTLE>,
-//IEntityTypeConfiguration<JIS_PD_DETAIL>,
 IEntityTypeConfiguration<PUB_SA_DETAIL>,
 IEntityTypeConfiguration<PUB_SA>,
 IEntityTypeConfiguration<HBPO_SE_REPORT>,
@@ -101,7 +46,8 @@ IEntityTypeConfiguration<BBAC_SE_EDI>,
 IEntityTypeConfiguration<HBPO_SE_EDI>,
 IEntityTypeConfiguration<BBAC_SE_SA_REPORT>,
 IEntityTypeConfiguration<HBPO_SE_SA_REPORT>,
-IEntityTypeConfiguration<JIT_SE_SA_REPORT>
+IEntityTypeConfiguration<JIT_SE_SA_REPORT>,
+IEntityTypeConfiguration<CodeSetting>
 {
     public void Configure(EntityTypeBuilder<Material> builder)
     { }
@@ -112,21 +58,12 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
     public void Configure(EntityTypeBuilder<TB_RePartsRelationship> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<TB_ReAssemblyRelationship> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<CentralizedControl> builder)
     { }
 
     public void Configure(EntityTypeBuilder<TB_PRICE_LIST> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<Class7> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class8> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<HBPO_SA> builder)
     { }
 
@@ -139,165 +76,27 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
     public void Configure(EntityTypeBuilder<BBAC_SE_DETAIL> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<Class13> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class14> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class15> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class16> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class17> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class18> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<JIT_SA> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<JIT_SE_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class21> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class22> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class23> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BJ_SE_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class26> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class27> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class28> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class29> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<IN_SE_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class32> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class33> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class34> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class35> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<HBPO_DN> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BBAC_DN> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<JIT_DN> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BJ_DN> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<IN_DN> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class41> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<INVOICE_GRP> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<Class43> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class44> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class45> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class46> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<Class47> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BBAC_DN_DETAIL> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<BBAC_SA_DETAIL> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<BJ_DN_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<HBPO_DN_DETAIL> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<HBPO_SA_DETAIL> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<IN_DN_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<JIT_DN_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<JIT_SA_DETAIL> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<TB_PRICE_BJ> builder)
     { }
 
     public void Configure(EntityTypeBuilder<INVOICE_WAIT_DETAIL> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<HBPO_NOT_SA> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<HBPO_NOT_SA_DETAIL> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<BBAC_NOT_SA> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<BBAC_NOT_SA_DETAIL> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<JIT_NOT_SA> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<JIT_NOT_SA_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BJ_NOT_SA> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BJ_NOT_SA_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<IN_NOT_SA> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<IN_NOT_SA_DETAIL> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<HBPO_CAN_SA> builder)
     { }
 
@@ -310,33 +109,12 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
     public void Configure(EntityTypeBuilder<BBAC_CAN_SA_DETAIL> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<JIT_CAN_SA> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<JIT_CAN_SA_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BJ_CAN_SA> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<BJ_CAN_SA_DETAIL> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<IN_CAN_SA> builder)
-    //{ }
-
-    //public void Configure(EntityTypeBuilder<IN_CAN_SA_DETAIL> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<INVOICE_MAP_GROUP> builder)
     { }
 
     public void Configure(EntityTypeBuilder<INVOICE_NOT_SETTLE> builder)
     { }
 
-    //public void Configure(EntityTypeBuilder<JIS_PD_DETAIL> builder)
-    //{ }
-
     public void Configure(EntityTypeBuilder<PUB_SA_DETAIL> builder)
     { }
 
@@ -351,32 +129,50 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
 
     public void Configure(EntityTypeBuilder<PUB_SE_DETAIL> builder)
     { }
+
     public void Configure(EntityTypeBuilder<PUB_NOT_SA_DETAIL> builder)
     { }
+
     public void Configure(EntityTypeBuilder<PUB_CAN_SA> builder)
     { }
+
     public void Configure(EntityTypeBuilder<PUB_CAN_SA_DETAIL> builder)
     { }
+
     public void Configure(EntityTypeBuilder<HBPO_PD_DETAIL> builder)
     { }
+
     public void Configure(EntityTypeBuilder<BBAC_PD_DETAIL> builder)
     { }
+
     public void Configure(EntityTypeBuilder<PUB_PD_DETAIL> builder)
     { }
+
     public void Configure(EntityTypeBuilder<M_PD_DETAIL> builder)
     { }
+
     public void Configure(EntityTypeBuilder<BOM> builder)
     { }
+
     public void Configure(EntityTypeBuilder<PURCHASE_PRICE> builder)
     { }
+
     public void Configure(EntityTypeBuilder<BBAC_SE_EDI> builder)
     { }
+
     public void Configure(EntityTypeBuilder<HBPO_SE_EDI> builder)
     { }
+
     public void Configure(EntityTypeBuilder<BBAC_SE_SA_REPORT> builder)
     { }
+
     public void Configure(EntityTypeBuilder<HBPO_SE_SA_REPORT> builder)
     { }
+
     public void Configure(EntityTypeBuilder<JIT_SE_SA_REPORT> builder)
     { }
+
+    public void Configure(EntityTypeBuilder<CodeSetting> builder)
+    { }
+
 }

docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs

@@ -171,6 +171,11 @@ public class IdentityDbSeed : IDbSeed<IdentityDbContext>
         context.Set<INVOICE_MAP_GROUP>().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系456", InvGroupNum = "发票和结算分组对应关系分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
         context.Set<INVOICE_NOT_SETTLE>().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
         context.Set<INVOICE_NOT_SETTLE>().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
+        context.Set<HBPO_SE_REPORT>().Add(new HBPO_SE_REPORT { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", SeqNumber = "测试数据", AssemblyCode = "测试数据", InjectionCode = "测试数据", BeginDate = new DateTime(), ShippingDate = new DateTime(), WmsBillNum = "测试数据" });
+        context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "1号测试数据" });
+        context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "2号测试数据" });
+        context.Set<PUB_SA_DETAIL>().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "1号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" });
+        context.Set<PUB_SA_DETAIL>().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "2号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" });
     }
 
     private static void InitDictionaries(DbContext context)

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs

@@ -2,7 +2,7 @@ using WTA.Shared.Attributes;
 using WTA.Shared.Domain;
 
 namespace WTA.Application.Identity.Entities.SystemManagement;
-
+[Hidden]
 [Order(4)]
 [SystemManagement]
 public class Department : BaseTreeEntity<Department>

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
-using WTA.Application.Identity.Entities.SystemManagement.Group;
 using WTA.Shared.Attributes;
 using WTA.Shared.Domain;
 
 namespace WTA.Application.Identity.Entities.SystemManagement;
+
 [Hidden]
 [Display(Name = "JIT发运数据与结算数据对比实体")]
 public class JIT_SE_SA_REPORT : BaseEntity

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs

@@ -4,7 +4,7 @@ using WTA.Shared.Domain;
 
 namespace WTA.Application.Identity.Entities.SystemManagement;
 
-[Order(7)]
+[Order(2)]
 [SystemManagement]
 [Display(Name = "物料主数据")]
 public class Material : BaseEntity

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs

@@ -39,7 +39,7 @@ public class PUB_SA_DETAIL : BaseEntity
     /// <summary>
     /// 结算单号
     /// </summary>
-    [Display(Name = "结算单号")]
+    [Display(Name = "结算单据")]
     public string BillNum { get; set; } = null!;
 
     /// <summary>

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Permission.cs

@@ -3,7 +3,7 @@ using WTA.Shared.Attributes;
 using WTA.Shared.Domain;
 
 namespace WTA.Application.Identity.Entities.SystemManagement;
-
+[Hidden]
 [Order(3)]
 [SystemManagement]
 public class Permission : BaseTreeEntity<Permission>

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs

@@ -2,7 +2,7 @@ using WTA.Shared.Attributes;
 using WTA.Shared.Domain;
 
 namespace WTA.Application.Identity.Entities.SystemManagement;
-
+[Hidden]
 [Order(5)]
 [SystemManagement]
 public class Post : BaseEntity

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Role.cs

@@ -2,7 +2,7 @@ using WTA.Shared.Attributes;
 using WTA.Shared.Domain;
 
 namespace WTA.Application.Identity.Entities.SystemManagement;
-
+[Hidden]
 [Order(2)]
 [SystemManagement]
 public class Role : BaseEntity

docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs

@@ -1,6 +1,6 @@
 namespace WTA.Shared.Attributes;
 
-[AttributeUsage(AttributeTargets.Property,AllowMultiple =true)]
+[AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
 public class OneToManyAttribute<TEntity> : Attribute, ITypeAttribute
 {
     public Type Type { get; set; } = null!;