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
new file mode 100644
index 00000000..52a14e90
--- /dev/null
+++ b/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
+{
+ ///
+ /// BBAC发运
+ ///
+ 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; }
+
+ ///
+ /// 日顺序号
+ ///
+ [Display(Name = "日顺序号")]
+ public string SeqNumber { get; set; }
+
+ ///
+ /// 小总成号
+ ///
+ [Display(Name = "小总成号")]
+ public string AssemblyCode { get; set; }
+
+ ///
+ /// 注塑码
+ ///
+ [Display(Name = "注塑码")]
+ public string InjectionCode { get; set; }
+
+ ///
+ /// 订单时间
+ ///
+ [Display(Name = "订单时间")]
+ public DateTime BeginDate { get; set; }
+ }
+
+ ///
+ /// 导出
+ ///
+ 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; }
+
+ ///
+ /// 日顺序号
+ ///
+ [Display(Name = "日顺序号")]
+ [ExporterHeader(DisplayName = "日顺序号")]
+ public string SeqNumber { get; set; }
+
+ ///
+ /// 小总成号
+ ///
+ [Display(Name = "小总成号")]
+ [ExporterHeader(DisplayName = "小总成号")]
+ public string AssemblyCode { get; set; }
+
+ ///
+ /// 注塑码
+ ///
+ [Display(Name = "注塑码")]
+ [ExporterHeader(DisplayName = "注塑码")]
+ public string InjectionCode { get; set; }
+
+ ///
+ /// 订单时间
+ ///
+ [Display(Name = "订单时间")]
+ [ExporterHeader(DisplayName = "订单时间")]
+ public DateTime BeginDate { get; set; }
+ }
+
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PURCHASE_PRICE_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PURCHASE_PRICE_DTO.cs
index 2ae8e495..e0405c23 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PURCHASE_PRICE_DTO.cs
+++ b/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; }
}
+ ///
+ /// 导入
+ ///
public class PURCHASE_PRICE_IMPORT_DTO
{
///
@@ -39,11 +42,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public decimal Price { get; set; }
}
- public class PURCHASE_PRICE_REQUEST_DTO : RequestDtoBase
- {
-
- }
-
///
/// 导出
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/TB_RePartsRelationship_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/TB_RePartsRelationship_DTO.cs
new file mode 100644
index 00000000..3f14d49f
--- /dev/null
+++ b/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
+{
+ ///
+ /// 客户替换件关系
+ ///
+ public class TB_RePartsRelationship_DTO
+ {
+ ///
+ /// 零件号
+ ///
+ [Display(Name = "零件号")]
+ public string LU { set; get; }
+
+ ///
+ /// 替换零件号
+ ///
+ [Display(Name = "替换零件号")]
+ public string RepLU { set; get; }
+
+ ///
+ /// 客户编码
+ ///
+ [Display(Name = "客户编码")]
+ public string ClientCode { set; get; }
+
+ ///
+ /// 业务类型
+ ///
+ [Display(Name = "业务类型")]
+ public string BusinessType { set; get; }
+ }
+
+ ///
+ /// 导入
+ ///
+ public class TB_RePartsRelationship_IMPORT_DTO
+ {
+ ///
+ /// 零件号
+ ///
+ [Display(Name = "零件号")]
+ [ImporterHeader(Name = "零件号")]
+ public string LU { set; get; }
+
+ ///
+ /// 替换零件号
+ ///
+ [Display(Name = "替换零件号")]
+ [ImporterHeader(Name = "替换零件号")]
+ public string RepLU { set; get; }
+
+ ///
+ /// 客户编码
+ ///
+ [Display(Name = "客户编码")]
+ [ImporterHeader(Name = "客户编码")]
+ public string ClientCode { set; get; }
+
+ ///
+ /// 业务类型
+ ///
+ [Display(Name = "业务类型")]
+ [ImporterHeader(Name = "业务类型")]
+ public string BusinessType { set; get; }
+ }
+
+ ///
+ /// 导出
+ ///
+ public class TB_RePartsRelationship_EXPORT_DTO
+ {
+ ///
+ /// 零件号
+ ///
+ [Display(Name = "零件号")]
+ [ExporterHeader(DisplayName = "零件号")]
+ public string LU { set; get; }
+
+ ///
+ /// 替换零件号
+ ///
+ [Display(Name = "替换零件号")]
+ [ExporterHeader(DisplayName = "替换零件号")]
+ public string RepLU { set; get; }
+
+ ///
+ /// 客户编码
+ ///
+ [Display(Name = "客户编码")]
+ [ExporterHeader(DisplayName = "客户编码")]
+ public string ClientCode { set; get; }
+
+ ///
+ /// 业务类型
+ ///
+ [Display(Name = "业务类型")]
+ [ExporterHeader(DisplayName = "业务类型")]
+ public string BusinessType { set; get; }
+ }
+
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/IMaterialRelationshipAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/IMaterialRelationshipAppService.cs
index 4eb83bf6..1e08ca1c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/IMaterialRelationshipAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/IMaterialRelationshipAppService.cs
@@ -1,22 +1,6 @@
-using System;
-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
+namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
{
- public interface IMaterialRelationshipAppService : ICrudAppService,
- IBranchBaseDataAppService
-
+ public interface IMaterialRelationshipAppService
{
}
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/MaterialRelationshipDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/MaterialRelationshipDtoBase.cs
index af306943..51f1625b 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/MaterialRelationshipDtoBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/MaterialRelationshipDtoBase.cs
@@ -108,14 +108,6 @@ namespace Win.Sfs.SettleAccount.MaterialRelationships
- }
-
- ///
- /// FIS
- ///
- public class MaterialRelationshipRequestDto : RequestDtoBase
- {
-
}
///
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
new file mode 100644
index 00000000..2f7f9e68
--- /dev/null
+++ b/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
+{
+ ///
+ /// BBAC发运单
+ ///
+ [AllowAnonymous]
+ [Route("api/settleaccount/BBAC_SE_DETAIL_SERVICE")]
+ public class BBAC_SE_DETAIL_SERVICE : ApplicationService
+ {
+ ///
+ /// BBAC发运单仓储
+ ///
+ private readonly INormalEfCoreRepository _repository;
+
+ ///
+ /// excel服务
+ ///
+ private readonly IExcelImportAppService _excelImportService;
+
+ ///
+ /// 构造
+ ///
+ public BBAC_SE_DETAIL_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService)
+ {
+ _repository = repository;
+ _excelImportService = excelImportService;
+ }
+
+ #region 导出
+ ///
+ /// 导出
+ ///
+ [HttpPost]
+ [Route("Export")]
+ public async Task 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>(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 查询
+ ///
+ /// 获取列表
+ ///
+ [HttpPost]
+ [Route("list")]
+ public async Task> 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>(entities);
+ return new PagedResultDto(totalCount, dtos);
+ }
+ #endregion
+
+ }
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PURCHASE_PRICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PURCHASE_PRICE_SERVICE.cs
index 64e2d8e1..56bc276b 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PURCHASE_PRICE_SERVICE.cs
+++ b/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
/// 采购价格单
///
[AllowAnonymous]
- [Route("api/settleaccount/PURCHASE_PRICE_SERVICE")]
+ [Route("api/settleaccount/PURCHASE_PRICE_LIST_Service")]
public class PURCHASE_PRICE_SERVICE : SettleAccountApplicationBase
{
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs
new file mode 100644
index 00000000..510f3358
--- /dev/null
+++ b/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
+{
+ ///
+ /// 客户替换件关系
+ ///
+ [AllowAnonymous]
+ [Route("api/settleaccount/TB_RePartsRelationship_SERVICE")]
+ public class TB_RePartsRelationship_SERVICE : SettleAccountApplicationBase
+ {
+ ///
+ /// 客户替换件关系仓储
+ ///
+ private readonly INormalEfCoreRepository _repository;
+
+ public TB_RePartsRelationship_SERVICE(
+ INormalEfCoreRepository repository,
+ IDistributedCache cache,
+ IExcelImportAppService excelImportService,
+ ISnowflakeIdGenerator snowflakeIdGenerator,
+ ICommonManager commonManager
+ ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
+ {
+ _repository = repository;
+ }
+
+ #region 导入、导出
+ ///
+ /// 导入
+ ///
+ [HttpPost]
+ [Route("Import")]
+ public async Task ImportAsync([FromForm] IFormFileCollection files)
+ {
+ ExportImporter _exportImporter = new ExportImporter();
+ var result = await _exportImporter.UploadExcelImport(files, _excelImportService);
+ var _ls = ObjectMapper.Map, List>(result);
+ List _errorList = new List();
+ var checkList = new List();
+
+ 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;
+ }
+
+ ///
+ /// 导出
+ ///
+ [HttpPost]
+ [Route("Export")]
+ public async Task 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>(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
+ ///
+ /// 获取列表
+ ///
+ [HttpPost]
+ [Route("list")]
+ public async Task> 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>(entities);
+ return new PagedResultDto(totalCount, dtos);
+ }
+ #endregion
+
+ }
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs
index 2901dbd5..d54a51e2 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs
+++ b/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
{
-
///
/// BOM
///
- //[Authorize(SettleAccountPermissions.Boms.Default)]
[AllowAnonymous]
- [Route("api/settleaccount/bom")]
+ [Route("api/settleaccount/BomAppService")]
public class BomAppService : SettleAccountApplicationBase
{
///
@@ -52,46 +31,21 @@ namespace Win.Sfs.SettleAccount.Boms
///
private readonly INormalEfCoreRepository _repository;
- private readonly IGuidGenerator _guidGenerator;
-
- private readonly IObjectMapper _objectMapper;
-
- private readonly IExcelImportAppService _excelImportService;
-
- private readonly ISettleAccountBranchEfCoreRepository _materialRepository;
-
- private readonly ISettleAccountBranchEfCoreRepository _importColumnMapRepository;
-
- private readonly ISettleAccountBranchEfCoreRepository _versionRepository;
-
///
- /// 췽
+ ///
///
public BomAppService(
INormalEfCoreRepository repository,
- IGuidGenerator guidGenerator,
- IObjectMapper objectMapper,
- IExcelImportAppService excelImportService,
- ISnowflakeIdGenerator snowflakeIdGenerator,
- ICommonManager commonManager,
- ISettleAccountBranchEfCoreRepository versionRepository,
- ISettleAccountBranchEfCoreRepository materialRepository,
- ISettleAccountBranchEfCoreRepository importColumnMapRepository,
- IDistributedCache cache
- ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
+ IDistributedCache cache,
+ IExcelImportAppService excelImportService,
+ ISnowflakeIdGenerator snowflakeIdGenerator,
+ ICommonManager commonManager
+ ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
{
_repository = repository;
-
- _guidGenerator = guidGenerator;
- _objectMapper = objectMapper;
-
- _excelImportService = excelImportService;
- _versionRepository = versionRepository;
- _materialRepository = materialRepository;
- _importColumnMapRepository = importColumnMapRepository;
}
- #region 롢
+ #region
///
///
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs
index b5ae7bb8..974f55a4 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs
@@ -1,42 +1,22 @@
-using System;
-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.Authorization;
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
{
///
/// 期间设置
///
- //[Authorize(SettleAccountPermissions.CentralizedControls.Default)]
[AllowAnonymous]
[Route("api/settleaccount/CentralizedControl")]
public class CentralizedControlAppService : SettleAccountApplicationBase
@@ -46,16 +26,11 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
///
private readonly INormalEfCoreRepository _repository;
- private readonly ISettleAccountBranchEfCoreRepository _mapRepository;
-
- private readonly IExcelImportAppService _excelImportService;
///
- /// 构建方法
+ /// 构造
///
public CentralizedControlAppService(
INormalEfCoreRepository repository,
- IGuidGenerator guidGenerator,
- IObjectMapper objectMapper,
IDistributedCache 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 导出
///
/// 导出
///
@@ -103,6 +77,9 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
#endregion
#region 开启、关闭
+ ///
+ /// 开启版本
+ ///
[HttpPost]
[Route("open")]
public async Task OpenVersion(List ids)
@@ -115,11 +92,11 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
return true;
}
- [HttpPost]
- [Route("close")]
///
/// 关闭版本
///
+ [HttpPost]
+ [Route("close")]
public async Task ClosedVersion(List ids)
{
var entitys = await _repository.GetListAsync(p => ids.Contains(p.Id));
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs
index 0799658f..a94034d5 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs
+++ b/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
{
private readonly IGuidGenerator _guidGenerator;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
index 74fdd97a..7119c3b6 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
+++ b/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
{
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs
index a55828dd..50786880 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs
@@ -44,6 +44,7 @@ namespace Win.Sfs.SettleAccount.FISes
///
//[Authorize(SettleAccountPermissions.FISs.Default)]
//[AllowAnonymous]
+ [ApiExplorerSettings(IgnoreApi = true)]
[Route("api/settleaccount/fis")]
public class FISAppService : SettleAccountApplicationBase, IFISAppService
{
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Factories/FactoryAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Factories/FactoryAppService.cs
index 66e90a7c..1f80c2c3 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Factories/FactoryAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Factories/FactoryAppService.cs
@@ -32,7 +32,8 @@ namespace Win.Sfs.SettleAccount.Entities.Factories
///
/// 区域相关应用服务
///
- [Authorize(SettleAccountPermissions.Factorys.Default)]
+ [ApiExplorerSettings(IgnoreApi = true)]
+ [Authorize(SettleAccountPermissions.Factorys.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/Factory")]
public class FactoryAppService : SettleAccountApplicationBase, IFactoryAppService
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Inventories/InventoryDetailAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Inventories/InventoryDetailAppService.cs
index 05c6cf5b..eaf038b1 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Inventories/InventoryDetailAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Inventories/InventoryDetailAppService.cs
@@ -38,6 +38,7 @@ namespace Win.Sfs.SettleAccount.InventoryDetails
///
/// Ӧ÷
///
+ [ApiExplorerSettings(IgnoreApi = true)]
[Authorize(SettleAccountPermissions.InventoryDetails.Default)]
[Route("api/settleaccount/InventoryDetail")]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Invoices/InvoiceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Invoices/InvoiceAppService.cs
index 3f029460..7fc58cd3 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Invoices/InvoiceAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Invoices/InvoiceAppService.cs
@@ -41,6 +41,7 @@ namespace Win.Sfs.SettleAccount.Entities.Invoices
///
/// 发票汇总导入
///
+ [ApiExplorerSettings(IgnoreApi = true)]
[Route("api/settleaccount/Invoices")]
[Authorize(SettleAccountPermissions.Invoices.Default)]
public class InvoiceAppService : SettleAccountApplicationBase,IInvoiceAppService
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs
index 49a9c6e2..a3d8b078 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs
@@ -48,6 +48,7 @@ namespace Win.Sfs.SettleAccount.ItemInvoicePrices
///
//[Authorize(SettleAccountPermissions.ItemInvoicePrices.Default)]
//[AllowAnonymous]
+ [ApiExplorerSettings(IgnoreApi = true)]
[Route("api/settleaccount/ItemInvoicePrice")]
public class ItemInvoicePriceAppService : SettleAccountApplicationBase, IItemInvoicePriceAppService
{
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
index e8ff5673..f5935648 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
+++ b/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
///
/// 客户零件关系
///
- //[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
[AllowAnonymous]
- [Route("api/settleaccount/MaterialRelationship")]
+ [Route("api/settleaccount/MaterialRelationshipAppService")]
public class MaterialRelationshipAppService : SettleAccountApplicationBase
{
///
@@ -47,17 +47,11 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
///
private readonly INormalEfCoreRepository _repository;
- private readonly ISettleAccountBranchEfCoreRepository _mapRepository;
- private readonly IExcelImportAppService _excelImportService;
-
///
- /// 构造方法
+ /// 构造
///
public MaterialRelationshipAppService(
INormalEfCoreRepository repository,
- IGuidGenerator guidGenerator,
- IObjectMapper objectMapper,
- ISettleAccountBranchEfCoreRepository mapRepository,
IDistributedCache 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
///
[HttpPost]
[Route("Export")]
- public async Task ExportAsync(MaterialRelationshipRequestDto input)
+ public async Task 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
///
[HttpPost]
[Route("list")]
- public async Task> GetListAsync(MaterialRelationshipRequestDto input)
+ public async Task> GetListAsync(RequestDtoBase input)
{
var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs
index afa51279..bab519e5 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs
+++ b/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*/
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs
index fcf5fba2..0d95ac09 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs
+++ b/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
///
/// 物料主数据
///
- //[Authorize(SettleAccountPermissions.Materials.Default)]
[AllowAnonymous]
- [Route("api/settleaccount/Material")]
+ [Route("api/settleaccount/MaterialAppService")]
public class MaterialAppService : SettleAccountApplicationBase
{
- private readonly IExcelImportAppService _excelImportService;
+ ///
+ /// 物料主数据仓储
+ ///
private readonly INormalEfCoreRepository _repository;
- private readonly ISettleAccountBranchEfCoreRepository _bomRepository;
- private readonly ISettleAccountBranchEfCoreRepository _bomversionRepository;
- private readonly ISettleAccountBranchEfCoreRepository _priceRepository;
- private readonly ISettleAccountBranchEfCoreRepository _priceversionRepository;
- private readonly ISettleAccountBranchEfCoreRepository _mapRepository;
- private readonly ISettleAccountBranchEfCoreRepository _relationshipRepository;
-
///
- /// 构建方法
+ /// 构造
///
public MaterialAppService(
INormalEfCoreRepository repository,
- ISettleAccountBranchEfCoreRepository mapRepository,
- ISettleAccountBranchEfCoreRepository bomRepository,
- ISettleAccountBranchEfCoreRepository bomversionRepository,
- TaskJobService service,
- ISettleAccountBranchEfCoreRepository relationshipRepository,
- ISettleAccountBranchEfCoreRepository priceRepository,
- ISettleAccountBranchEfCoreRepository priceversionRepository,
-
- IDistributedCache cache,
+ IDistributedCache cache,
IExcelImportAppService excelImportService,
ISnowflakeIdGenerator snowflakeIdGenerator,
ICommonManager commonManager
-
- ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
+ ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
{
- _priceRepository = priceRepository;
- _priceversionRepository = priceversionRepository;
- _bomRepository = bomRepository;
- _excelImportService = excelImportService;
- _repository = repository;
- _relationshipRepository = relationshipRepository;
- _mapRepository = mapRepository;
- _bomversionRepository = bomversionRepository;
-
+ _repository = repository;
}
#region 导入、导出
@@ -79,7 +46,6 @@ namespace Win.Sfs.SettleAccount.Entities.Materials
///
[HttpPost]
[Route("Export")]
- //[Authorize(SettleAccountPermissions.Materials.Default)]
public virtual async Task ExportAsync(MaterialRequestDto input)
{
string _fileName = string.Format("物料主数据_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd"));
@@ -112,7 +78,6 @@ namespace Win.Sfs.SettleAccount.Entities.Materials
///
[HttpPost]
[Route("list")]
- //[Authorize(SettleAccountPermissions.Materials.Default)]
virtual public async Task> GetListAsync(MaterialRequestDto input)
{
var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount,
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs
index 5e414290..d5fd17e0 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs
@@ -37,6 +37,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 区域相关应用服务
///
//[Authorize(SettleAccountPermissions.Prebatchs.Default)]
+ [ApiExplorerSettings(IgnoreApi = true)]
[AllowAnonymous]
[Route("api/settleaccount/Prebatch")]
public class PrebatchAppService : SettleAccountApplicationBase, IPrebatchAppService
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
index 0114faf8..d15c82e2 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
+++ b/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
{
///
- /// 标准价格单-相关应用服务
+ /// 销售价格单
///
- //[Authorize(SettleAccountPermissions.PriceLists.Default)]
- [Route("api/SettleAccount/PriceList")]
+ [Route("api/SettleAccount/TB_PRICE_LIST_Service")]
[AllowAnonymous]
public class PriceListAppService : ApplicationService
{
@@ -55,15 +45,15 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
}
#region 导入、导出
- ///
- /// 获取导入模板
- ///
- [HttpPost("import-template")]
- public virtual async Task ImportTemplateAsync()
- {
- await Task.CompletedTask;
- return new Microsoft.AspNetCore.Mvc.OkResult();
- }
+ /////
+ ///// 获取导入模板
+ /////
+ //[HttpPost("import-template")]
+ //public virtual async Task ImportTemplateAsync()
+ //{
+ // await Task.CompletedTask;
+ // return new Microsoft.AspNetCore.Mvc.OkResult();
+ //}
///
/// 导入
@@ -100,7 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpPost]
[Route("Export")]
- public virtual async Task ExportAsync(TB_PRICE_LIST_RequestDto input)
+ public virtual async Task ExportAsync(RequestDto input)
{
IExporter _csv = new CsvExporter();
@@ -115,18 +105,8 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
string _fileName = string.Empty;
//声明导出容器
- byte[] result = null;
- switch (input.FileType)
- {
- 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;
- }
+ _fileName = string.Format("销售价格单_{0}.xlsx", Guid.NewGuid().ToString());
+ byte[] result = await _excel.ExportAsByteArray(dtoDetails);
result.ShouldNotBeNull();
//保存导出文件到服务器存成二进制
@@ -147,12 +127,8 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpPost]
[Route("list")]
- public virtual async Task> GetListAsync(TB_PRICE_LIST_RequestDto input)
+ public virtual async Task> 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>(entitys);
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs
index 17de68ad..105d4f5b 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs
+++ b/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
///
/// 备件价格
///
- //[Authorize(SettleAccountPermissions.PriceLists.Default)]
[AllowAnonymous]
- [Route("api/SettleAccount/PriceListBJ")]
- public class PriceListAppServiceBJ : CurdBaseAppService
+ [Route("api/SettleAccount/TB_PRICE_BJ_Service")]
+ public class PriceListAppServiceBJ : SettleAccountApplicationBase
{
private readonly INormalEfCoreRepository _repository;
private readonly PriceListManagerBJ _priceListManagerBJ;
- private readonly IExcelImportAppService _excelImportService;
- private readonly ISettleAccountBranchEfCoreRepository _mapRepository;
public PriceListAppServiceBJ(
INormalEfCoreRepository repository,
PriceListManagerBJ priceListManagerBJ,
+ IDistributedCache cache,
IExcelImportAppService excelImportService,
- ISettleAccountBranchEfCoreRepository mapRepository
-
- ) :base(repository: repository, excelImportService: excelImportService)
+ ISnowflakeIdGenerator snowflakeIdGenerator,
+ ICommonManager commonManager
+ ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
{
_repository = repository;
_priceListManagerBJ = priceListManagerBJ;
- _excelImportService = excelImportService;
-
- _mapRepository = mapRepository;
}
#region 导入、导出
@@ -48,7 +47,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpPost]
[Route("Import")]
- public override async Task ImportAsync([FromForm] IFormFileCollection files, string version)
+ public async Task ImportAsync([FromForm] IFormFileCollection files, string version)
{
ExportImporter _exportImporter = new ExportImporter();
var result = await _exportImporter.UploadExcelImport(files, _excelImportService);
@@ -68,6 +67,40 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
await _priceListManagerBJ.ImportAsync(_ls.ToList(), version);
return ApplicationConsts.SuccessStr;
}
+
+ ///
+ /// 导出
+ ///
+ [HttpPost]
+ [Route("Export")]
+ public async Task 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>(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
+ ///
+ /// 获取列表
+ ///
+ [HttpPost]
+ [Route("list")]
+ public async Task> 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>(entities);
+ return new PagedResultDto(totalCount, dtos);
+ }
#endregion
#region 原有的方法之后废弃删除
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
index 2fe00504..839dd426 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
@@ -36,6 +36,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch
///
/// 总成与结算件关系
///
+ [ApiExplorerSettings(IgnoreApi = true)]
[AllowAnonymous]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
index 0d087b65..ef9458f1 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
@@ -51,6 +51,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
///
/// 大众准时化结算明细导入-R3已结
///
+ [ApiExplorerSettings(IgnoreApi = true)]
[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/SettleAccount")]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs
index 57ff7cee..08435e55 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs
@@ -40,6 +40,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettlementParts
///
//[Authorize(SettleAccountPermissions.SettlementParts.Default)]
//[AllowAnonymous]
+ [ApiExplorerSettings(IgnoreApi = true)]
[Route("api/settleaccount/SettlementPart")]
public class SettlementPartAppService : SettleAccountApplicationBase, ISettlementPartAppService
{
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnHQSettleAccounts/UnHQSettleAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnHQSettleAccounts/UnHQSettleAppService.cs
index 3a4aec7d..3e588d04 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnHQSettleAccounts/UnHQSettleAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnHQSettleAccounts/UnHQSettleAppService.cs
@@ -29,6 +29,7 @@ namespace Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts
///
/// 红旗主机场明细导入
///
+ [ApiExplorerSettings(IgnoreApi = true)]
[Authorize(SettleAccountPermissions.HQ_HPlatform.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/UnHQSettle")]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index cf9c34db..b88f2bcc 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/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();
}
+ ///
+ /// 客户替换件关系
+ ///
+ private void CreateMapTB_RePartsRelationship()
+ {
+ CreateMap();
+ CreateMap();
+ CreateMap();
+ }
+
+ ///
+ /// BBAC发运单
+ ///
+ private void CreateMapBBAC_SE_DETAIL()
+ {
+ CreateMap();
+ CreateMap();
+ }
+
}
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs
index 53e58ea5..42388ae4 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs
+++ b/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
{
///
/// 取值字段【零件号】
@@ -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;
+ }
+
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
index 951f492c..7f4d2780 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/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();
});
}
+
+
+ ///
+ /// 客户替换件关系
+ ///
+ private static void ConfigureTB_RePartsRelationship(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_TB_RePartsRelationship", options.Schema);
+ b.ConfigureByConvention();
+ });
+ }
#endregion
-
+
#region 北汽
-
-
+
+
///
/// 一汽轿车平台验收结算明细-导入
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230712032712_20230712-1.Designer.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230712032712_20230712-1.Designer.cs
new file mode 100644
index 00000000..31dca313
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230712032712_20230712-1.Designer.cs
@@ -0,0 +1,3870 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Win.Sfs.SettleAccount;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+ [DbContext(typeof(SettleAccountDbContext))]
+ [Migration("20230712032712_20230712-1")]
+ partial class _202307121
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+ .HasAnnotation("Relational:MaxIdentifierLength", 128)
+ .HasAnnotation("ProductVersion", "5.0.8")
+ .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_CAN_SA", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("State")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_CAN_SA");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_CAN_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_CAN_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_NOT_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_NOT_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_PD_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("RELU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("REPN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_PD_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SA", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DNBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("State")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SA");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BeginDate")
+ .HasColumnType("datetime2");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ShippingDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.Property("WmsBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SE_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_EDI", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BeginDate")
+ .HasColumnType("datetime2");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SE_EDI");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_REPORT", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BeginDate")
+ .HasColumnType("datetime2");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("EDIQty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ShippingDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.Property("WmsBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SE_REPORT");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_SA_REPORT", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property