diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Controls/CentralizedControlDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Controls/CentralizedControlDtoBase.cs
index 2cb1abf7..ec330e85 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Controls/CentralizedControlDtoBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Controls/CentralizedControlDtoBase.cs
@@ -1,4 +1,5 @@
+using Magicodes.ExporterAndImporter.Core;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -96,6 +97,35 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
}
+ ///
+ /// 导出Dto
+ ///
+ public class CentralizedControlExportDto
+ {
+ ///
+ /// 年度
+ ///
+ [ExporterHeader(DisplayName = "年度")]
+ public string Year { get; protected set; }
+
+ ///
+ /// 期间
+ ///
+ [ExporterHeader(DisplayName = "期间")]
+ public string Period { set; get; }
+
+ ///
+ /// 版本
+ ///
+ [ExporterHeader(DisplayName = "版本")]
+ public string Version { set; get; }
+
+ ///
+ /// 是否开放状态
+ ///
+ [ExporterHeader(DisplayName = "是否开放状态")]
+ public int State { set; get; }
+ }
}
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 d9ea22d1..af306943 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
@@ -109,146 +109,75 @@ namespace Win.Sfs.SettleAccount.MaterialRelationships
}
+
///
/// FIS
///
- public class MaterialRelationshipRequestDto : RequestDtoBase, IBranch
+ public class MaterialRelationshipRequestDto : RequestDtoBase
{
- ///
- /// ERP物料号
- ///
-
- public virtual string ErpMaterialCode { get; set; }
- ///
- /// 物料描述
- ///
- public virtual string MaterialDesc { get; set; }
- ///
- /// 物料属性
- ///
- public virtual string MaterialProperty { get; set; }
-
- ///
- /// 结算物料号
- ///
- public virtual string SettleMaterialCode { get; set; }
-
- ///
- /// 发货看板物料号
- ///
- public virtual string ShipMaterailCode { get; set; }
-
- public virtual Guid BranchId { get; set; }
-
-
- ///
- /// 估价类
- ///
- public virtual string AppraisalCategory { get; set; }
-
-
- public virtual Guid ParentId { get; set; }
-
- public virtual Guid UserId { get; set; }
}
+
///
/// FIS
///
public class MaterialRelationshipExportDto
{
-
///
- /// ERP物料号
+ /// 厂内物料号
///
- [ExporterHeaderAttribute(DisplayName = "ERP物料号")]
-
- public virtual string ErpMaterialCode { get; set; }
- ///
- /// 物料描述
- ///
- [ExporterHeaderAttribute(DisplayName = "ERP物料描述")]
- public virtual string MaterialDesc { get; set; }
+ [ExporterHeaderAttribute(DisplayName = "厂内物料号")]
+ public string ErpMaterialCode { get; set; }
- [ExporterHeaderAttribute(DisplayName = "估价类")]
///
- /// 估价类
- ///
- public virtual string AppraisalCategory { get; set; }
- ///
- /// 物料属性
+ /// 厂内物料描述
///
- [ExporterHeaderAttribute(DisplayName = "物料属性")]
-
- public virtual string MaterialProperty { get; set; }
+ [ExporterHeaderAttribute(DisplayName = "厂内物料描述")]
+ public string MaterialDesc { get; set; }
///
- /// 结算物料号
+ /// 客户物料号
///
[ExporterHeaderAttribute(DisplayName = "客户物料号")]
-
- public virtual string SettleMaterialCode { get; set; }
-
+ public string SettleMaterialCode { get; set; }
///
- /// 发货看板物料号
+ /// 客户物料描述
///
- [ExporterHeaderAttribute(DisplayName = "发货看板物料号")]
-
- public virtual string ShipMaterailCode { get; set; }
-
-
-
+ [ExporterHeaderAttribute(DisplayName = "客户物料描述")]
+ public virtual string MaterialProperty { get; set; }
}
+
[ImportProject(Name = "零件匹配关系")]
public class MaterialRelationshipImportDto
{
///
- /// ERP物料号
+ /// 厂内物料号
///
- [ImporterHeader(Name = "ERP物料号")]
+ [ImporterHeader(Name = "厂内物料号")]
[Required(ErrorMessage = "{0}是必填项")]
[MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
- public virtual string ErpMaterialCode { get; set; }
- ///
- /// 物料描述
- ///
- [ImporterHeader(Name = "ERP物料描述")]
- //[Required(ErrorMessage = "{0}是必填项")]
- [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
- public virtual string MaterialDesc { get; set; }
- ///
- /// 物料属性
- ///
- [ImporterHeader(Name = "物料属性")]
- //[Required(ErrorMessage = "{0}是必填项")]
- [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
- public virtual string MaterialProperty { get; set; }
+ public string ErpMaterialCode { get; set; }
///
- /// 结算物料号
+ /// 厂内物料描述
///
- [ImporterHeader(Name = "结算物料号")]
- //[Required(ErrorMessage = "{0}是必填项")]
+ [ImporterHeader(Name = "厂内物料描述")]
[MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
- public virtual string SettleMaterialCode { get; set; }
-
+ public string MaterialDesc { get; set; }
///
- /// 发货看板物料号
+ /// 客户物料号
///
- [ImporterHeader(Name = "发货看板物料号")]
- //[Required(ErrorMessage = "{0}是必填项")]
- [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
- public virtual string ShipMaterailCode { get; set; }
-
+ [ImporterHeader(Name = "客户物料号")]
+ public string SettleMaterialCode { get; set; }
- [ImporterHeader(Name = "估价类")]
///
- /// 估价类
+ /// 客户物料描述
///
- public virtual string AppraisalCategory { get; set; }
+ [ImporterHeader(Name = "客户物料描述")]
+ public virtual string MaterialProperty { get; set; }
}
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 da1c845d..b5ae7bb8 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
@@ -26,6 +26,7 @@ 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;
@@ -65,6 +66,27 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
_excelImportService = excelImportService;
}
+ #region 导入、导出
+ ///
+ /// 导出
+ ///
+ [HttpPost]
+ [Route("Export")]
+ public async Task ExportAsync(CentralizedControlRequestDto 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
///
/// 获取列表
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 a25df6aa..e8ff5673 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
@@ -18,80 +18,83 @@ using Volo.Abp.ObjectMapping;
using Volo.Abp.Uow;
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.MaterialRelationships;
+using Win.Sfs.SettleAccount.Entities.Prices;
using Win.Sfs.SettleAccount.ExcelImporter;
using Win.Sfs.SettleAccount.ExportReports;
using Win.Sfs.SettleAccount.MaterialRelationships;
using Win.Sfs.Shared.CacheBase;
+using Win.Sfs.Shared.RepositoryBase;
using Win.Utils;
namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
{
///
- /// 区域相关应用服务
+ /// 客户零件关系
///
- //[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
- //[AllowAnonymous]
+ //[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
+ [AllowAnonymous]
[Route("api/settleaccount/MaterialRelationship")]
- public class MaterialRelationshipAppService : SettleAccountApplicationBase, IMaterialRelationshipAppService
+ public class MaterialRelationshipAppService : SettleAccountApplicationBase
{
+ ///
+ /// 客户零件关系仓储
+ ///
+ private readonly INormalEfCoreRepository _repository;
private readonly ISettleAccountBranchEfCoreRepository _mapRepository;
private readonly IExcelImportAppService _excelImportService;
- private readonly ISettleAccountBranchEfCoreRepository _repository;
+
///
- /// 构建方法
+ /// 构造方法
///
- /// 构建UID
- /// 自动map
- /// 仓储接口
- /// 缓存
- public MaterialRelationshipAppService(IGuidGenerator guidGenerator,
- IObjectMapper objectMapper,
- ISettleAccountBranchEfCoreRepository repository,
- ISettleAccountBranchEfCoreRepository mapRepository,
+ public MaterialRelationshipAppService(
+ INormalEfCoreRepository repository,
+ IGuidGenerator guidGenerator,
+ IObjectMapper objectMapper,
+ ISettleAccountBranchEfCoreRepository mapRepository,
IDistributedCache cache,
IExcelImportAppService excelImportService,
ISnowflakeIdGenerator snowflakeIdGenerator,
ICommonManager commonManager
) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
{
- _mapRepository = mapRepository;
_repository = repository;
+
+ _mapRepository = mapRepository;
_excelImportService = excelImportService;
}
+ #region 导入、导出
///
- /// 导入功能
+ /// 导入
///
- /// 上传的文件(前端已经限制只能上传一个附件)
- ///
[HttpPost]
- [Route("ExcelImport-Map")]
- [DisableRequestSizeLimit]
- public async Task MaterialRelationshipUploadExcelImportMap([FromForm] IFormFileCollection files)
+ [Route("Import")]
+ public async Task ImportAsync([FromForm] IFormFileCollection files)
{
ExportImporter _exportImporter = new ExportImporter();
- var mapList=_mapRepository.Where(p => p.ProjectName == SettleAccountModuleName.MaterialRelationship).ToList();
- var result = await _exportImporter.ExtendExcelImport(files, _excelImportService,mapList);
+ 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.ErpMaterialCode }
- into g
+ 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("ERP物料号{0}有重复", itm.Key.ErpMaterialCode), string.Empty));
- // _errorList.Add(string.Format("ERP物料号{0}有重复",itm.Key.ErpMaterialCode));
}
}
foreach (var itm in _ls)
@@ -104,307 +107,394 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
}
else
{
- checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode), string.Empty));
- //_errorList.Add(string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode));
- //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
- //await _repository.InsertAsync(itm);
+ await _repository.InsertAsync(itm);
}
- //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
-
}
if (checkList.Count > 0)
{
return await ExportErrorReportAsync(checkList);
}
-
return ApplicationConsts.SuccessStr;
}
-
-
///
- /// 导入功能
+ /// 导出
///
- /// 上传的文件(前端已经限制只能上传一个附件)
- ///
[HttpPost]
- [Route("ExcelImport")]
- [DisableRequestSizeLimit]
- public async Task MaterialRelationshipUploadExcelImport([FromForm] IFormFileCollection files)
+ [Route("Export")]
+ public async Task ExportAsync(MaterialRelationshipRequestDto 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.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.ErpMaterialCode}
- 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("ERP物料号{0}有重复", itm.Key.ErpMaterialCode), string.Empty));
- // _errorList.Add(string.Format("ERP物料号{0}有重复",itm.Key.ErpMaterialCode));
- }
- }
- foreach (var itm in _ls)
- {
- var _first = _repository.FirstOrDefault(p => p.ErpMaterialCode == itm.ErpMaterialCode );
- if (_first != null)
- {
- _first.Update(itm.MaterialDesc,itm.MaterialProperty,itm.SettleMaterialCode,itm.ShipMaterailCode);
- await _repository.UpdateAsync(_first);
- }
- else
- {
- checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode), string.Empty));
- //_errorList.Add(string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode));
- //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
- //await _repository.InsertAsync(itm);
- }
- //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
-
- }
- if (checkList.Count > 0)
- {
- return await ExportErrorReportAsync(checkList);
- }
+ var result = await _exportImporter.ExcelExporter(dtos);
+ result.ShouldNotBeNull();
- return ApplicationConsts.SuccessStr;
+ await _excelImportService.SaveBlobAsync(new SaveExcelImportInputDto { Name = fileName, Content = result });
+ return fileName;
}
+ #endregion
-
-
+ #region CURD
///
- /// 按ID获取唯一实体
+ /// 获取列表
///
- ///
- /// 返回实体全部属性
- ///
- /// ID
- /// 实体DTO
- [HttpGet]
- [Route("{id}")]
- virtual public async Task GetAsync(Guid id)
+ [HttpPost]
+ [Route("list")]
+ public async Task> GetListAsync(MaterialRelationshipRequestDto input)
{
- var result = await GetFromCacheAsync(id);
- var dto = ObjectMapper.Map(result);
- return dto;
+ 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
-
- private async Task GetFromCacheAsync(Guid id)
- {
- var result = await _repository.GetAsync(id);
-
-
- return result;
- }
+ #region 原方法(废弃)
+ /////
+ ///// 导入功能
+ /////
+ ///// 上传的文件(前端已经限制只能上传一个附件)
+ /////
+ //[HttpPost]
+ //[Route("ExcelImport-Map")]
+ //[DisableRequestSizeLimit]
+ //public async Task MaterialRelationshipUploadExcelImportMap([FromForm] IFormFileCollection files)
+ //{
+ // ExportImporter _exportImporter = new ExportImporter();
+ // var mapList = _mapRepository.Where(p => p.ProjectName == SettleAccountModuleName.MaterialRelationship).ToList();
+ // var result = await _exportImporter.ExtendExcelImport(files, _excelImportService, mapList);
+ // 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.ErpMaterialCode }
+ // 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("ERP物料号{0}有重复", itm.Key.ErpMaterialCode), string.Empty));
+ // // _errorList.Add(string.Format("ERP物料号{0}有重复",itm.Key.ErpMaterialCode));
+ // }
+ // }
+ // foreach (var itm in _ls)
+ // {
+ // var _first = _repository.FirstOrDefault(p => p.ErpMaterialCode == itm.ErpMaterialCode);
+ // if (_first != null)
+ // {
+ // _first.Update(itm.MaterialDesc, itm.MaterialProperty, itm.SettleMaterialCode, itm.ShipMaterailCode);
+ // await _repository.UpdateAsync(_first);
+ // }
+ // else
+ // {
+ // checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode), string.Empty));
+ // //_errorList.Add(string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode));
+ // //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
+ // //await _repository.InsertAsync(itm);
+ // }
+ // //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
+
+ // }
+ // if (checkList.Count > 0)
+ // {
+ // return await ExportErrorReportAsync(checkList);
+ // }
+
+ // return ApplicationConsts.SuccessStr;
+ //}
- private async Task GetCountAsync(MaterialRelationshipRequestDto input)
- {
- return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
- }
+ /////
+ ///// 导入功能
+ /////
+ ///// 上传的文件(前端已经限制只能上传一个附件)
+ /////
+ //[HttpPost]
+ //[Route("ExcelImport")]
+ //[DisableRequestSizeLimit]
+ //public async Task MaterialRelationshipUploadExcelImport([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.ErpMaterialCode }
+ // 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("ERP物料号{0}有重复", itm.Key.ErpMaterialCode), string.Empty));
+ // // _errorList.Add(string.Format("ERP物料号{0}有重复",itm.Key.ErpMaterialCode));
+ // }
+ // }
+ // foreach (var itm in _ls)
+ // {
+ // var _first = _repository.FirstOrDefault(p => p.ErpMaterialCode == itm.ErpMaterialCode);
+ // if (_first != null)
+ // {
+ // _first.Update(itm.MaterialDesc, itm.MaterialProperty, itm.SettleMaterialCode, itm.ShipMaterailCode);
+ // await _repository.UpdateAsync(_first);
+ // }
+ // else
+ // {
+ // checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode), string.Empty));
+ // //_errorList.Add(string.Format("关系表中不存在ERP物料号{0}!", itm.ErpMaterialCode));
+ // //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
+ // //await _repository.InsertAsync(itm);
+ // }
+ // //itm.SetId(GuidGenerator.Create(), GuidGenerator.Create());
+
+ // }
+ // if (checkList.Count > 0)
+ // {
+ // return await ExportErrorReportAsync(checkList);
+ // }
+
+ // return ApplicationConsts.SuccessStr;
+ //}
/////
+ ///// 按ID获取唯一实体
+ /////
+ /////
+ ///// 返回实体全部属性
+ /////
+ ///// ID
+ ///// 实体DTO
+ //[HttpGet]
+ //[Route("{id}")]
+ //virtual public async Task GetAsync(Guid id)
+ //{
+ // var result = await GetFromCacheAsync(id);
+ // var dto = ObjectMapper.Map(result);
+ // return dto;
+ //}
- ///
- /// 根据筛选条件获取实体列表
- ///
- ///
- /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
- ///
- /// 请求条件
- /// 实体DTO列表
- [HttpPost]
- [Route("list")]
- virtual public async Task> GetListAsync(MaterialRelationshipRequestDto input)
- {
- var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
- input.SkipCount, true);
- var totalCount = await GetCountAsync(input);
- var dtos = ObjectMapper.Map, List>(entities);
+ //private async Task GetFromCacheAsync(Guid id)
+ //{
+ // var result = await _repository.GetAsync(id);
- return new PagedResultDto(totalCount, dtos);
- }
+ // return result;
+ //}
- ///
- /// 获取实体总数
- ///
- /// 实体总数
- [HttpGet]
- [Route("count")]
- virtual public async Task GetTotalCountAsync(Guid branchId)
- {
- return await _repository.GetCountAsync(branchId);
- }
- ///
- /// 获取全部实体列表
- ///
- /// 实体DTO列表
- [HttpGet]
- [Route("all")]
- virtual public async Task> GetAllAsync(Guid branchId)
- {
- var entities = await _repository.GetAllAsync(branchId, true);
+ //private async Task GetCountAsync(MaterialRelationshipRequestDto input)
+ //{
+ // return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
+ //}
- var dtos = ObjectMapper.Map, List>(entities);
- return new ListResultDto(dtos);
- }
+ ///////
+ /////
+ ///// 根据筛选条件获取实体列表
+ /////
+ /////
+ ///// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
+ /////
+ ///// 请求条件
+ ///// 实体DTO列表
+ //[HttpPost]
+ //[Route("list")]
+ //virtual public async Task> GetListAsync(MaterialRelationshipRequestDto input)
+ //{
+ // var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
+ // input.SkipCount, true);
+
+ // var totalCount = await GetCountAsync(input);
+ // var dtos = ObjectMapper.Map, List>(entities);
+
+ // return new PagedResultDto(totalCount, dtos);
+ //}
-
- ///
- /// 新增实体
- ///
- /// 新增实体DTO
- /// 实体DTO
+ /////
+ ///// 获取实体总数
+ /////
+ ///// 实体总数
+ //[HttpGet]
+ //[Route("count")]
+ //virtual public async Task GetTotalCountAsync(Guid branchId)
+ //{
+ // return await _repository.GetCountAsync(branchId);
+ //}
- [HttpPost]
- [Route("")]
- virtual public async Task CreateAsync(MaterialRelationshipCreateDto input)
- {
+ /////
+ ///// 获取全部实体列表
+ /////
+ ///// 实体DTO列表
+ //[HttpGet]
+ //[Route("all")]
+ //virtual public async Task> GetAllAsync(Guid branchId)
+ //{
+ // var entities = await _repository.GetAllAsync(branchId, true);
- var _first = _repository.Where(p => p.ErpMaterialCode == input.ErpMaterialCode ).FirstOrDefault();
+ // var dtos = ObjectMapper.Map, List>(entities);
- if (_first != null)
- {
- throw new BusinessException("001", "已经存数据请修改后创建");
- }
+ // return new ListResultDto(dtos);
+ //}
- var entity = new MaterialRelationship(
- GuidGenerator.Create(),
- input.BranchId,
- input.ErpMaterialCode,
- input.MaterialDesc,
- input.MaterialProperty,
- input.SettleMaterialCode,
- input.ShipMaterailCode,
- input.AppraisalCategory
-
- );
- await _repository.InsertAsync(entity);
+ /////
+ ///// 新增实体
+ /////
+ ///// 新增实体DTO
+ ///// 实体DTO
- ////create cache
- //await Cache.SetAsync(entity.Id.ToString(), entity,
- // CacheStrategyConst.FIVE_MINUTES);
+ //[HttpPost]
+ //[Route("")]
+ //virtual public async Task CreateAsync(MaterialRelationshipCreateDto input)
+ //{
- var dto = ObjectMapper.Map(entity);
- return dto;
- }
+ // var _first = _repository.Where(p => p.ErpMaterialCode == input.ErpMaterialCode).FirstOrDefault();
- ///
- /// 修改实体
- ///
- /// ID
- /// 修改实体DTO
- /// 实体DTO
- [HttpPut]
- [Route("{id}")]
- virtual public async Task UpdateAsync(Guid id, MaterialRelationshipUpdateDto input)
- {
- var entity = await _repository.GetAsync(id);
- if (entity != null)
- {
- entity.Update( input.MaterialDesc, input.MaterialProperty, input.SettleMaterialCode, input.ShipMaterailCode);
+ // if (_first != null)
+ // {
+ // throw new BusinessException("001", "已经存数据请修改后创建");
+ // }
- await _repository.UpdateAsync(entity);
-
- var dto = ObjectMapper.Map(entity);
- return dto;
- }
- else
- {
- return null;
- }
+ // var entity = new MaterialRelationship(
+ // GuidGenerator.Create(),
+ // input.BranchId,
+ // input.ErpMaterialCode,
- }
+ // input.MaterialDesc,
+ // input.MaterialProperty,
+ // input.SettleMaterialCode,
+ // input.ShipMaterailCode,
+ // input.AppraisalCategory
- ///
- /// 删除实体
- ///
- /// ID
- /// 无
- [HttpDelete]
- [Route("{id}")]
- virtual public async Task DeleteAsync(Guid id)
- {
- var entity = await GetFromCacheAsync(id);
- await Cache.DeleteAsync(id.ToString());
- await _repository.DeleteAsync(id);
- }
- ///
- /// 按IDs删除实体列表
- ///
- /// IDs
- /// 是否执行成功
- [HttpPost]
- [Route("delete")]
- virtual public async Task DeleteListAsync(List ids)
- {
- var _query = _repository.Where(p => ids.Contains(p.Id));
- int i = await _query.BatchDeleteAsync();
+ // );
- if (i == 0)
- {
- return false;
- }
- return true;
- }
- [HttpPost]
- [Route("Export")]
- virtual public async Task ExportAsync(MaterialRelationshipRequestDto input)
- {
- //var _userId = CurrentUser.Id.Value.ToString();
- string _fileName = string.Format("零件关系_{0}.xlsx",Guid.NewGuid().ToString());
- var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
- 0, true);
+ // await _repository.InsertAsync(entity);
- var dtoDetails = ObjectMapper.Map, List>(entities);
+ // ////create cache
+ // //await Cache.SetAsync(entity.Id.ToString(), entity,
+ // // CacheStrategyConst.FIVE_MINUTES);
- //声明导出容器
- ExportImporter _exportImporter = new ExportImporter();
+ // var dto = ObjectMapper.Map(entity);
+ // return dto;
- var result = await _exportImporter.ExcelExporter(dtoDetails);
+ //}
- result.ShouldNotBeNull();
+ /////
+ ///// 修改实体
+ /////
+ ///// ID
+ ///// 修改实体DTO
+ ///// 实体DTO
+ //[HttpPut]
+ //[Route("{id}")]
+ //virtual public async Task UpdateAsync(Guid id, MaterialRelationshipUpdateDto input)
+ //{
+ // var entity = await _repository.GetAsync(id);
+ // if (entity != null)
+ // {
+ // entity.Update(input.MaterialDesc, input.MaterialProperty, input.SettleMaterialCode, input.ShipMaterailCode);
+
+ // await _repository.UpdateAsync(entity);
+
+
+ // var dto = ObjectMapper.Map(entity);
+ // return dto;
+ // }
+ // else
+ // {
+ // return null;
+ // }
+
+ //}
- //保存导出文件到服务器存成二进制
- await _excelImportService.SaveBlobAsync(
- new SaveExcelImportInputDto
- {
- Name = _fileName,
- Content = result
- }
- );
- return _fileName;
- }
+ /////
+ ///// 删除实体
+ /////
+ ///// ID
+ ///// 无
+ //[HttpDelete]
+ //[Route("{id}")]
+ //virtual public async Task DeleteAsync(Guid id)
+ //{
+ // var entity = await GetFromCacheAsync(id);
+ // await Cache.DeleteAsync(id.ToString());
+ // await _repository.DeleteAsync(id);
+ //}
+
+ /////
+ ///// 按IDs删除实体列表
+ /////
+ ///// IDs
+ ///// 是否执行成功
+ //[HttpPost]
+ //[Route("delete")]
+ //virtual public async Task DeleteListAsync(List ids)
+ //{
+ // var _query = _repository.Where(p => ids.Contains(p.Id));
+ // int i = await _query.BatchDeleteAsync();
+
+ // if (i == 0)
+ // {
+ // return false;
+ // }
+ // return true;
+ //}
+ //[HttpPost]
+ //[Route("Export")]
+ //virtual public async Task ExportAsync(MaterialRelationshipRequestDto input)
+ //{
+ // //var _userId = CurrentUser.Id.Value.ToString();
+ // string _fileName = string.Format("零件关系_{0}.xlsx", Guid.NewGuid().ToString());
+ // var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
+ // 0, true);
+
+ // var dtoDetails = ObjectMapper.Map, List>(entities);
+
+ // //声明导出容器
+ // ExportImporter _exportImporter = new ExportImporter();
+
+ // var result = await _exportImporter.ExcelExporter(dtoDetails);
+
+ // result.ShouldNotBeNull();
+
+ // //保存导出文件到服务器存成二进制
+ // await _excelImportService.SaveBlobAsync(
+ // new SaveExcelImportInputDto
+ // {
+ // Name = _fileName,
+ // Content = result
+ // }
+ // );
+ // return _fileName;
+ //}
+ #endregion
}
}
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 2f8c4a80..0114faf8 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
@@ -36,7 +36,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
[Route("api/SettleAccount/PriceList")]
[AllowAnonymous]
public class PriceListAppService : ApplicationService
- /*, IPriceListAppService*/
{
private readonly PriceListManager _priceListManager;
private readonly IExcelImportAppService _excelImportService;
@@ -71,7 +70,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpPost]
[Route("Import")]
- //[Authorize(SettleAccountPermissions.PriceLists.Create)]
public virtual async Task ImportAsync([FromForm] IFormFileCollection files, string version)
{
ExportImporter _exportImporter = new ExportImporter();
@@ -102,7 +100,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpPost]
[Route("Export")]
- //[Authorize(SettleAccountPermissions.PriceLists.Default)]
public virtual async Task ExportAsync(TB_PRICE_LIST_RequestDto input)
{
IExporter _csv = new CsvExporter();
@@ -150,7 +147,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpPost]
[Route("list")]
- //[Authorize(SettleAccountPermissions.PriceLists.Default)]
public virtual async Task> GetListAsync(TB_PRICE_LIST_RequestDto input)
{
if (!string.IsNullOrEmpty(input.Version))
@@ -158,7 +154,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
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 GetCountAsync(input);
+ var totalCount = await _priceListManager.GetCountAsync(input.Filters, GuidGenerator.Create());
var dtos = ObjectMapper.Map, List>(entitys);
return new PagedResultDto(totalCount, dtos);
}
@@ -168,7 +164,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpDelete]
[Route("{id}")]
- //[Authorize(SettleAccountPermissions.PriceLists.Delete)]
virtual public async Task DeleteAsync(Guid id)
{
await _priceListManager.DeleteAsync(id);
@@ -179,169 +174,160 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
///
[HttpPost]
[Route("delete")]
- //[Authorize(SettleAccountPermissions.PriceLists.Delete)]
virtual public async Task DeleteListAsync(List ids)
{
return await _priceListManager.DeleteListAsync(ids);
}
#endregion
- #region 私有方法
- ///
- /// 获取总数
- ///
- private async Task GetCountAsync(TB_PRICE_LIST_RequestDto input)
- {
- return await _priceListManager.GetCountAsync(input.Filters, GuidGenerator.Create());
- }
- #endregion
-
-
-
-
-
- ///
- /// 获取总数
- ///
- private async Task GetCountAsync(PriceListRequestDto input)
- {
- return await _priceListManager.GetCountAsync(input.Filters, GuidGenerator.Create());
- }
-
-
- ///
- /// 结算总成和ERP总成价格对比
- ///
- /// 上传的文件(前端已经限制只能上传一个附件)
- ///
- [HttpGet]
- [Route("BomDiffPrice-Make")]
- [DisableRequestSizeLimit]
- [Authorize(SettleAccountPermissions.PriceLists.Default)]
-
- public async Task SettledPartAndErpPartPriceDiffMake(string version, string customerCode)
- {
-
- List customConditionList = new List();
-
- customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "Bom定价差异明细" });
- customConditionList.Add(new CustomCondition() { Name = "Version", Value = string.IsNullOrEmpty(version) ? string.Empty : version });
- customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = string.IsNullOrEmpty(customerCode) ? string.Empty : customerCode });
-
- var _taskid = await _service.ExportEnqueueAsync("Bom定价差异明细", ExportExtentsion.Excel, version, string.Empty, CurrentUser, typeof(SettledPartAndErpPartPriceDiffExportService), customConditionList, (rs) =>
- {
-
- });
- return _taskid;
- }
-
- [HttpPost]
- [Route("job/list")]
- [Authorize(SettleAccountPermissions.PriceLists.Default)]
- [UnitOfWork(false)]
- virtual public async Task> GetListAsync(JobRequestDto input)
- {
- return await _service.GetListAsync(input);
- }
-
- ///
- /// 按ID获取唯一实体
- ///
- ///
- /// 返回实体全部属性
- ///
- /// ID
- /// 实体DTO
-
- [HttpGet]
- [Route("{id}")]
- /// [Authorize(SettleAccountPermissions.PriceLists.Default)]
- virtual public async Task GetAsync(Guid id)
- {
- var result = await _priceListManager.GetAsync(id); ;
- var dto = ObjectMapper.Map(result);
- return dto;
- }
+ #region 原方法(废弃)
+ // ///
+ // /// 获取总数
+ // ///
+ // private async Task GetCountAsync(PriceListRequestDto input)
+ // {
+ // return await _priceListManager.GetCountAsync(input.Filters, GuidGenerator.Create());
+ // }
- ///
- /// 根据筛选条件获取实体列表
- ///
- ///
- /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
- ///
- /// 请求条件
- /// 实体DTO列表
- [HttpPost]
- [Route("versionlist")]
- // [Authorize(SettleAccountPermissions.PriceLists.Default)]
- virtual public async Task> GetVersionListAsync(PriceListRequestDto input)
- {
-
-
- var entities = await _priceListManager.GetVersionListAsync(input.Filters, input.Sorting, input.MaxResultCount,input.SkipCount);
- var totalCount = await GetCountAsync(input);
- var dtos = ObjectMapper.Map, List>(entities);
- return new PagedResultDto(totalCount, dtos);
- }
+ // ///
+ // /// 结算总成和ERP总成价格对比
+ // ///
+ // /// 上传的文件(前端已经限制只能上传一个附件)
+ // ///
+ // [HttpGet]
+ // [Route("BomDiffPrice-Make")]
+ // [DisableRequestSizeLimit]
+ // [Authorize(SettleAccountPermissions.PriceLists.Default)]
+
+ // public async Task SettledPartAndErpPartPriceDiffMake(string version, string customerCode)
+ // {
+ // List customConditionList = new List();
-
-
-
-
- ///
- /// 获取实体总数
- ///
- /// 实体总数
- [HttpGet]
- [Route("count")]
- //[Authorize(SettleAccountPermissions.PriceLists.Default)]
- virtual public async Task GetTotalCountAsync(Guid branchId)
- {
- return await _priceListManager.GetCountAsync(new List(), branchId);
- }
-
- ///
- /// 获取全部实体列表
- ///
- /// 实体DTO列表
- [HttpGet]
- [Route("all")]
- //[Authorize(SettleAccountPermissions.PriceLists.Default)]
- virtual public async Task> GetAllAsync(Guid branchId)
- {
- var entities = await _priceListManager.GetAllAsync(branchId);
- var dtos = ObjectMapper.Map, List>(entities);
- return new ListResultDto(dtos);
- }
-
-
- ///
- /// 修改实体
- ///
- /// ID
- /// 修改实体DTO
- /// 实体DTO
- [HttpPut]
- [Route("{id}")]
- [Authorize(SettleAccountPermissions.PriceLists.Update)]
- virtual public async Task UpdateAsync(Guid id, PriceListDto input)
- {
- var entity = new PriceList(
-
- );
-
- var _ent = await _priceListManager.UpdateAsync(id, entity);
-
-
- var dto = ObjectMapper.Map(_ent);
- return dto;
- }
+ // customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "Bom定价差异明细" });
+ // customConditionList.Add(new CustomCondition() { Name = "Version", Value = string.IsNullOrEmpty(version) ? string.Empty : version });
+ // customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = string.IsNullOrEmpty(customerCode) ? string.Empty : customerCode });
+
+ // var _taskid = await _service.ExportEnqueueAsync("Bom定价差异明细", ExportExtentsion.Excel, version, string.Empty, CurrentUser, typeof(SettledPartAndErpPartPriceDiffExportService), customConditionList, (rs) =>
+ // {
+
+ // });
+ // return _taskid;
+ // }
+
+ // [HttpPost]
+ // [Route("job/list")]
+ // [Authorize(SettleAccountPermissions.PriceLists.Default)]
+ // [UnitOfWork(false)]
+ // virtual public async Task> GetListAsync(JobRequestDto input)
+ // {
+ // return await _service.GetListAsync(input);
+ // }
+
+ // ///
+ // /// 按ID获取唯一实体
+ // ///
+ // ///
+ // /// 返回实体全部属性
+ // ///
+ // /// ID
+ // /// 实体DTO
+
+ // [HttpGet]
+ // [Route("{id}")]
+ // /// [Authorize(SettleAccountPermissions.PriceLists.Default)]
+ // virtual public async Task GetAsync(Guid id)
+ // {
+ // var result = await _priceListManager.GetAsync(id); ;
+ // var dto = ObjectMapper.Map(result);
+ // return dto;
+
+ // }
+
+
+
+
+
+ // ///
+ // /// 根据筛选条件获取实体列表
+ // ///
+ // ///
+ // /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
+ // ///
+ // /// 请求条件
+ // /// 实体DTO列表
+ // [HttpPost]
+ // [Route("versionlist")]
+ //// [Authorize(SettleAccountPermissions.PriceLists.Default)]
+ // virtual public async Task> GetVersionListAsync(PriceListRequestDto input)
+ // {
+
+
+ // var entities = await _priceListManager.GetVersionListAsync(input.Filters, input.Sorting, input.MaxResultCount,input.SkipCount);
+ // var totalCount = await GetCountAsync(input);
+ // var dtos = ObjectMapper.Map, List>(entities);
+ // return new PagedResultDto(totalCount, dtos);
+ // }
+
+
+
+
+
+
+ // ///
+ // /// 获取实体总数
+ // ///
+ // /// 实体总数
+ // [HttpGet]
+ // [Route("count")]
+ // //[Authorize(SettleAccountPermissions.PriceLists.Default)]
+ // virtual public async Task GetTotalCountAsync(Guid branchId)
+ // {
+ // return await _priceListManager.GetCountAsync(new List(), branchId);
+ // }
+
+ // ///
+ // /// 获取全部实体列表
+ // ///
+ // /// 实体DTO列表
+ // [HttpGet]
+ // [Route("all")]
+ // //[Authorize(SettleAccountPermissions.PriceLists.Default)]
+ // virtual public async Task> GetAllAsync(Guid branchId)
+ // {
+ // var entities = await _priceListManager.GetAllAsync(branchId);
+ // var dtos = ObjectMapper.Map, List>(entities);
+ // return new ListResultDto(dtos);
+ // }
+
+
+ // ///
+ // /// 修改实体
+ // ///
+ // /// ID
+ // /// 修改实体DTO
+ // /// 实体DTO
+ // [HttpPut]
+ // [Route("{id}")]
+ // [Authorize(SettleAccountPermissions.PriceLists.Update)]
+ // virtual public async Task UpdateAsync(Guid id, PriceListDto input)
+ // {
+ // var entity = new PriceList(
+
+ // );
+
+ // var _ent = await _priceListManager.UpdateAsync(id, entity);
+
+
+ // var dto = ObjectMapper.Map(_ent);
+ // return dto;
+ // }
+ #endregion
}
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj
index d118845d..2cd48043 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj
@@ -6,7 +6,7 @@
net5.0
Win.Sfs.SettleAccount
false
- False
+ True
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index c314a15f..79c48568 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -620,9 +620,15 @@ namespace Win.Sfs.SettleAccount
CreateMap();
}
+ ///
+ /// 期间设置
+ ///
private void CreateMapCentralizedControl()
{
CreateMap().ReverseMap();
+ CreateMap();
+
+
CreateMap();
CreateMap();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs
index 03638929..968bed7d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs
@@ -1,11 +1,24 @@
-using System.ComponentModel.DataAnnotations;
-
-
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
namespace SettleAccount.Domain.BQ;
+///
+/// 采购价格单
+///
[Display(Name = "采购价格单")]
-
-public class PURCHASE_PRICE
+public class PURCHASE_PRICE : FullAuditedAggregateRoot
{
+ ///
+ /// 物料号
+ ///
+ [Display(Name = "物料号")]
+ public string LU { get; set; }
+
+ ///
+ /// 价格
+ ///
+ [Display(Name = "价格")]
+ public decimal Price { get; set; }
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Controls/CentralizedControl.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Controls/CentralizedControl.cs
index ad3f3fa7..27dc7461 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Controls/CentralizedControl.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Controls/CentralizedControl.cs
@@ -1,12 +1,11 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using Win.Sfs.Shared.DomainBase;
namespace Win.Sfs.SettleAccount.Entities.Controls
{
+ ///
+ /// 期间设置
+ ///
public class CentralizedControl: FullAuditedAggregateRootBase
{
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs
index 4120b314..30ee7f0a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs
@@ -1,24 +1,39 @@
using System;
-using System.ComponentModel.DataAnnotations;
using Win.Sfs.Shared.DomainBase;
-
-using Win.Sfs.Shared.Constant;
namespace Win.Sfs.SettleAccount.MaterialRelationships
{
///
- /// 物料关系
+ /// 客户零件关系
///
public class MaterialRelationship : FullAuditedAggregateRootBase
{
///
- /// ERP物料号
+ /// 厂内物料号
///
public string ErpMaterialCode { get; set; }
+
///
- /// 物料描述
+ /// 厂内物料描述
///
public string MaterialDesc { get; set; }
+
+ ///
+ /// 客户物料号
+ ///
+ public string SettleMaterialCode { get; set; }
+
+
+
+
+
+
+
+
+
+
+
+
///
/// 物料属性
///
@@ -27,10 +42,10 @@ namespace Win.Sfs.SettleAccount.MaterialRelationships
- ///
- /// 结算物料号
- ///
- public string SettleMaterialCode { get; set; }
+ /////
+ ///// 结算物料号
+ /////
+ //public string SettleMaterialCode { get; set; }
///
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 18d8073a..951f492c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
@@ -80,7 +80,8 @@ namespace Win.Sfs.SettleAccount
builder.ConfigureBomVersion(options);
//期间
builder.ConfigureCentralizedControl(options);
-
+ //采购价格单
+ builder.ConfigurePURCHASE_PRICE(options);
#endregion
@@ -322,6 +323,18 @@ namespace Win.Sfs.SettleAccount
});
}
+
+ ///
+ /// 采购价格单
+ ///
+ private static void ConfigurePURCHASE_PRICE(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_PURCHASE_PRICE", options.Schema);
+ b.ConfigureByConvention();
+ });
+ }
#endregion
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230711073528_20230711-2.Designer.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230711073528_20230711-2.Designer.cs
new file mode 100644
index 00000000..22b91f7b
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230711073528_20230711-2.Designer.cs
@@ -0,0 +1,3807 @@
+//
+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("20230711073528_20230711-2")]
+ partial class _202307112
+ {
+ 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("AssemblyCode")
+ .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("CustomerOfflineTime")
+ .HasColumnType("datetime2");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("EDIQty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property