diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettleAccounts/SettleAccountExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettleAccounts/SettleAccountExportDto.cs index 1e09d2be..6cb9cbb1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettleAccounts/SettleAccountExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettleAccounts/SettleAccountExportDto.cs @@ -80,7 +80,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [ExporterHeader(DisplayName = "结算供应商")] public virtual string SettlementSupplier { get; set; } - [ExporterHeader(DisplayName = "结算状态")] - public virtual int State { get; set; } + //[ExporterHeader(DisplayName = "结算状态")] + //public virtual int State { get; set; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs index 842d9d31..37e4eb0f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs @@ -80,8 +80,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [ExporterHeader(DisplayName = "结算供应商")] public virtual string SettlementSupplier { get; set; } - [ExporterHeader(DisplayName = "结算状态")] - public virtual int State { get; set; } + [ExporterHeader(DisplayName = "未结算原因")] public string UnsettledReason { get; set; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs new file mode 100644 index 00000000..1ef8185e --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs @@ -0,0 +1,96 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + public interface IWMSVWKanBanAppService + + { + + + + /// + /// 导入功能 + /// + /// 上传的文件(前端已经限制只能上传一个附件) + /// + + Task WMSVWKanBanUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode); + + + + + /// + /// 按ID获取唯一实体 + /// + /// + /// 返回实体全部属性 + /// + /// ID + /// 实体DTO + + Task GetAsync(Guid id); + + /// + /// 根据筛选条件获取实体列表 + /// + /// + /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 + /// + /// 请求条件 + /// 实体DTO列表 + + Task> GetListAsync(WMSVWKanBanRequestDto input); + + + + + /// + /// 根据筛选条件获取实体列表 + /// + /// + /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 + /// + /// 请求条件 + /// 实体DTO列表 + + Task> GetVersionListAsync(WMSVWKanBanVersionRequestDto input); + + + Task ExportAsync(WMSVWKanBanRequestDto input); + + /// + /// 获取实体总数 + /// + /// 实体总数 + + Task GetTotalCountAsync(Guid branchId); + + + + + ///// + ///// 删除实体 + ///// + ///// ID + ///// 无 + + Task DeleteAsync(Guid id); + + + /// + /// 按IDs删除实体列表 + /// + /// IDs + /// 是否执行成功 + + Task DeleteListAsync(List ids); + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs new file mode 100644 index 00000000..0824c763 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + public class WMSVWKanBanCreateDto : WMSVWKanBanDtoBase, IBranch + { + public virtual Guid BranchId { get; set; } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs new file mode 100644 index 00000000..a79b1353 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + + public class WMSVWKanBanDto : AuditedEntityDtoBase + { + /// + /// 期间 + /// + public string Period { set; get; } + + /// + /// 版本 + /// + public virtual string Version { get; set; } + + /// + ///看板条码号 + /// + public string Kanban { set; get; } + + /// + /// 入库关联号 + /// + public virtual string Relation { set; get; } + /// + /// 工厂 + /// + public virtual string Factory { set; get; } + /// + /// 零件号 + /// + public virtual string MaterialCode { set; get; } + /// + /// 零件类型 + /// + public virtual string PartType { set; get; } + /// + /// R3入库时间 + /// + public virtual DateTime SettleInputDate { set; get; } + + + /// + ///供应商编码 + /// + public virtual string SupplierCode { get; set; } + /// + /// 数量 + /// + public virtual decimal Qty { get; set; } + /// + /// 批次 + /// + + public virtual string Batch { get; set; } + + /// + /// 入库结算标识 + /// + public virtual string Flag { get; set; } + + /// + /// 结算日期 + /// + public virtual DateTime SettleDate { get; set; } + + /// + /// 结算状态 + /// + public virtual string State { get; set; } + + /// + /// 备注 + /// + public virtual string Remark { get; set; } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs new file mode 100644 index 00000000..def36a38 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + public class WMSVWKanBanDtoBase : CreateOrUpdateEntityDtoBase + { + + /// + /// 期间 + /// + public string Period { set; get; } + + + + /// + ///看板条码号 + /// + public string Kanban { set; get; } + + /// + /// 入库关联号 + /// + public virtual string Relation { set; get; } + /// + /// 工厂 + /// + public virtual string Factory { set; get; } + /// + /// 零件号 + /// + public virtual string MaterialCode { set; get; } + /// + /// 零件类型 + /// + public virtual string PartType { set; get; } + /// + /// R3入库时间 + /// + public virtual DateTime SettleInputDate { set; get; } + + + /// + ///供应商编码 + /// + public virtual string SupplierCode { get; set; } + /// + /// 数量 + /// + public virtual decimal Qty { get; set; } + /// + /// 批次 + /// + + public virtual string Batch { get; set; } + + /// + /// 入库结算标识 + /// + public virtual string Flag { get; set; } + + /// + /// 结算日期 + /// + public virtual DateTime SettleDate { get; set; } + + /// + /// 结算状态 + /// + public virtual int State { get; set; } + + + public virtual string Version { get; set; } + /// + /// 备注 + /// + public virtual string Remark { get; set; } + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs new file mode 100644 index 00000000..21e830f3 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs @@ -0,0 +1,92 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + public class WMSVWKanBanExportDto + { + + /// + /// 期间 + /// + [ExporterHeader(DisplayName = "期间")] + public string Period { set; get; } + + /// + /// 版本 + /// + [ExporterHeader(DisplayName = "版本")] + public virtual string Version { get; set; } + + /// + ///看板条码号 + /// + [ExporterHeader(DisplayName = "看板条码号")] + public string Kanban { set; get; } + + /// + /// 入库关联号 + /// + [ExporterHeader(DisplayName = "入库关联号")] + public virtual string Relation { set; get; } + /// + /// 工厂 + /// + [ExporterHeader(DisplayName = "工厂")] + public virtual string Factory { set; get; } + /// + /// 零件号 + /// + [ExporterHeader(DisplayName = "零件号")] + public virtual string MaterialCode { set; get; } + /// + /// 零件类型 + /// + [ExporterHeader(DisplayName = "零件类型")] + public virtual string PartType { set; get; } + /// + /// R3入库日期 + /// + [ExporterHeader(DisplayName = "R3入库日期")] + public virtual DateTime SettleInputDate { set; get; } + + + /// + ///供应商编码 + /// + [ExporterHeader(DisplayName = "供应商")] + public virtual string SupplierCode { get; set; } + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public virtual decimal Qty { get; set; } + /// + /// 批次 + /// + [ExporterHeader(DisplayName = "批次")] + public virtual string Batch { get; set; } + + /// + /// 入库结算标识 + /// + [ExporterHeader(DisplayName = "入库结算标识")] + public virtual string Flag { get; set; } + + /// + /// 结算日期 + /// + [ExporterHeader(DisplayName = "R3结算时间")] + public virtual DateTime SettleDate { get; set; } + + /// + /// 结算状态 + /// + [ExporterHeader(DisplayName = "结算状态")] + public virtual string State { get; set; } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs new file mode 100644 index 00000000..3bdd6acf --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs @@ -0,0 +1,93 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + public class WMSVWKanBanImportDto + { + + ///// + ///// 期间 + ///// + //[ImporterHeader(Name = "期间")] + //public string Period { set; get; } + + ///// + ///// 版本 + ///// + //[ImporterHeader(Name = "版本")] + //public virtual string Version { get; set; } + + /// + ///看板条码号 + /// + [ImporterHeader(Name = "看板条码号", FixAllSpace = true)] + public string Kanban { set; get; } + + /// + /// 入库关联号 + /// + [ImporterHeader(Name = "入库关联号")] + public virtual string Relation { set; get; } + /// + /// 工厂 + /// + [ImporterHeader(Name = "工厂")] + public virtual string Factory { set; get; } + /// + /// 零件号 + /// + [ImporterHeader(Name = "零件号", FixAllSpace = true)] + public virtual string MaterialCode { set; get; } + /// + /// 零件类型 + /// + [ImporterHeader(Name = "零件类型")] + public virtual string PartType { set; get; } + /// + /// R3入库日期 + /// + [ImporterHeader(Name = "R3入库日期")] + public virtual string SettleInputDate { set; get; } + + + /// + ///供应商编码 + /// + [ImporterHeader(Name = "供应商")] + public virtual string SupplierCode { get; set; } + /// + /// 数量 + /// + [ImporterHeader(Name = "数量")] + public virtual decimal Qty { get; set; } + /// + /// 批次 + /// + [ImporterHeader(Name = "批次")] + public virtual string Batch { get; set; } + + /// + /// 入库结算标识 + /// + [ImporterHeader(Name = "入库结算标识")] + public virtual string Flag { get; set; } + + /// + /// 结算日期 + /// + [ImporterHeader(Name = "R3结算时间")] + public virtual string SettleDate { get; set; } + + /// + /// 结算状态 + /// + [ImporterHeader(Name = "结算状态")] + public virtual string State { get; set; } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs new file mode 100644 index 00000000..751e15f3 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + + public class WMSVWKanBanRequestDto : RequestDtoBase + { + + /// + /// 期间 + /// + public string Period { set; get; } + + /// + /// 版本 + /// + public virtual string Version { get; set; } + + /// + ///看板条码号 + /// + public string Kanban { set; get; } + + /// + /// 入库关联号 + /// + public virtual string Relation { set; get; } + /// + /// 工厂 + /// + public virtual string Factory { set; get; } + /// + /// 零件号 + /// + public virtual string MaterialCode { set; get; } + /// + /// 零件类型 + /// + public virtual string PartType { set; get; } + /// + /// R3入库时间 + /// + public virtual DateTime SettleInputDate { set; get; } + + + /// + ///供应商编码 + /// + public virtual string SupplierCode { get; set; } + /// + /// 数量 + /// + public virtual decimal Qty { get; set; } + /// + /// 批次 + /// + + public virtual string Batch { get; set; } + + /// + /// 入库结算标识 + /// + public virtual string Flag { get; set; } + + /// + /// 结算日期 + /// + public virtual DateTime SettleDate { get; set; } + + /// + /// 结算状态 + /// + public virtual string State { get; set; } + + /// + /// 备注 + /// + public virtual string Remark { get; set; } + + public virtual Guid ParentId { get; set; } + public virtual Guid BranchId { get; set; } + + public virtual Guid UserId { get; set; } + + public virtual int FileType { get; set; } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs new file mode 100644 index 00000000..2634a16e --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + /// + /// SettleAccountVersion + /// + public class WMSVWKanBanVersionDtoBase : CreateOrUpdateEntityDtoBase + { + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; private set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + + + } + + + + public class WMSVWKanBanVersionDto : AuditedEntityDtoBase, IBranch + { + public string Year { get; set; } + /// + /// 期间 + /// + public string Period { get; set; } + /// + /// 版本号 + /// + public string Version { get; set; } + + /// + /// 客户号 + /// + public string CustomerCode { set; get; } + public Guid BranchId { get; set; } + } + + public class WMSVWKanBanVersionCreateDto : WMSVWKanBanVersionDtoBase + { } + public class WMSVWKanBanVersionUpdateDto : WMSVWKanBanVersionDtoBase + { } + public class WMSVWKanBanVersionRequestDto : RequestDtoBase, IBranch + { + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; private set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + public Guid BranchId { get; set; } + } + + public class WMSVWKanBanVersionImportDto + { + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; private set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs new file mode 100644 index 00000000..cbc4329f --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.SettleAccount.Entities.VWKanBan; + +namespace Win.Sfs.SettleAccount.Entities.WMSKanBan +{ + public class WMSVWKanBantUpdateDto : VWKanBanDtoBase + { + + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs new file mode 100644 index 00000000..6696223f --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs @@ -0,0 +1,91 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + public interface IWMSSparePartAppService + { + /// + /// 导入功能 + /// + /// 上传的文件(前端已经限制只能上传一个附件) + /// + + Task WMSSparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, + string year, string period, string version, string customerCode); + + /// + /// 按ID获取唯一实体 + /// + /// + /// 返回实体全部属性 + /// + /// ID + /// 实体DTO + + Task GetAsync(Guid id); + + /// + /// 根据筛选条件获取实体列表 + /// + /// + /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 + /// + /// 请求条件 + /// 实体DTO列表 + + Task> GetListAsync(WMSSparePartRequestDto input); + + + + + /// + /// 根据筛选条件获取实体列表 + /// + /// + /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 + /// + /// 请求条件 + /// 实体DTO列表 + + Task> GetVersionListAsync(WMSSparePartVersionRequestDto input); + + + Task ExportAsync(WMSSparePartRequestDto input); + + /// + /// 获取实体总数 + /// + /// 实体总数 + + Task GetTotalCountAsync(Guid branchId); + + + + + + ///// + ///// 删除实体 + ///// + ///// ID + ///// 无 + + Task DeleteAsync(Guid id); + + + /// + /// 按IDs删除实体列表 + /// + /// IDs + /// 是否执行成功 + + Task DeleteListAsync(List ids); + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs new file mode 100644 index 00000000..db4379be --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + public class WMSSparePartCreateDto : WMSSparePartDtoBase, IBranch + { + public virtual Guid BranchId { get; set; } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs new file mode 100644 index 00000000..7d45b460 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs @@ -0,0 +1,122 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + public class WMSSparePartDto : AuditedEntityDtoBase + { + /// + ///年 + /// + public string Year { get; set; } + /// + /// 期间 + /// + public string Period { set; get; } + /// + /// 版本号 + /// + public string Version { set; get; } + + /// + /// 行号 + /// + public string LineNumber { set; get; } + + + /// + /// 采购类型 + /// + public string PurchaseType { get; set; } + + /// + /// 采购订单号 + /// + public string PurchaseOrderNo { get; set; } + /// + /// 采购订单行项目 + /// + public string PurchaseOrderNoItem { get; set; } + /// + /// 采购订单文本 + /// + public string PurchaseOrderNoText { get; set; } + /// + /// 收货数量 + /// + public decimal ReceiptQty { get; set; } + + /// + /// 开票数量 + /// + public decimal InvoicedQty { get; set; } + /// + /// 不含税金额 + /// + public decimal AmountNoTax { get; set; } + /// + /// 采购价格不含税 + /// + public decimal PurchasePriceNoTax { get; set; } + /// + /// 科目号 + /// + public string AccountNum { get; set; } + /// + /// 物料代码 + /// + public string MaterialCode { get; set; } + /// + /// 物料描述 + /// + public string MaterialDesc { get; set; } + /// + /// 日期 + /// + public DateTime SpareDate { get; set; } + /// + /// 交货单号 + /// + public string DeliveryOrderNo { get; set; } + /// + /// 交货行号 + /// + public string DeliveryLineNum { get; set; } + /// + /// 批次号 + /// + public string BatchNo { get; set; } + /// + /// 单位 + /// + public string Unit { get; set; } + /// + /// 税率 + /// + public decimal TaxRate { get; set; } + /// + /// 税码 + /// + public string TaxCode { get; set; } + /// + /// 德国发票号 + /// + public string GermanInvoiceNo { get; set; } + /// + /// 工厂 + /// + public string Factory { get; set; } + /// + /// 工厂名称 + /// + public string FactoryName { get; set; } + /// + /// 备注 + /// + public string Extend { set; get; } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs new file mode 100644 index 00000000..ff78ca70 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + public class WMSSparePartDtoBase : CreateOrUpdateEntityDtoBase + { + + /// + ///年 + /// + public string Year { get; set; } + /// + /// 期间 + /// + public string Period { set; get; } + /// + /// 版本号 + /// + public string Version { set; get; } + + /// + /// 行号 + /// + public string LineNumber { set; get; } + + + /// + /// 采购类型 + /// + public string PurchaseType { get; set; } + + /// + /// 采购订单号 + /// + public string PurchaseOrderNo { get; set; } + /// + /// 采购订单行项目 + /// + public string PurchaseOrderNoItem { get; set; } + /// + /// 采购订单文本 + /// + public string PurchaseOrderNoText { get; set; } + /// + /// 收货数量 + /// + public decimal ReceiptQty { get; set; } + + /// + /// 开票数量 + /// + public decimal InvoicedQty { get; set; } + /// + /// 不含税金额 + /// + public decimal AmountNoTax { get; set; } + /// + /// 采购价格不含税 + /// + public decimal PurchasePriceNoTax { get; set; } + /// + /// 科目号 + /// + public string AccountNum { get; set; } + /// + /// 物料代码 + /// + public string MaterialCode { get; set; } + /// + /// 物料描述 + /// + public string MaterialDesc { get; set; } + /// + /// 日期 + /// + public DateTime SpareDate { get; set; } + /// + /// 交货单号 + /// + public string DeliveryOrderNo { get; set; } + /// + /// 交货行号 + /// + public string DeliveryLineNum { get; set; } + /// + /// 批次号 + /// + public string BatchNo { get; set; } + /// + /// 单位 + /// + public string Unit { get; set; } + /// + /// 税率 + /// + public decimal TaxRate { get; set; } + /// + /// 税码 + /// + public string TaxCode { get; set; } + /// + /// 德国发票号 + /// + public string GermanInvoiceNo { get; set; } + /// + /// 工厂 + /// + public string Factory { get; set; } + /// + /// 工厂名称 + /// + public string FactoryName { get; set; } + /// + /// 备注 + /// + public string Extend { set; get; } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs new file mode 100644 index 00000000..888e2dd8 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs @@ -0,0 +1,143 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + public class WMSSparePartExportDto + { + + /// + /// 期间 + /// + [ExporterHeader(DisplayName = "期间")] + public string Period { set; get; } + + /// + /// 版本 + /// + [ExporterHeader(DisplayName = "版本")] + public virtual string Version { get; set; } + + + /// + /// 行号 + /// + [ExporterHeader(DisplayName = "行号")] + public string LineNumber { set; get; } + + + /// + /// 采购类型 + /// + [ExporterHeader(DisplayName = "采购类型")] + public string PurchaseType { get; set; } + + /// + /// 采购订单号 + /// + [ExporterHeader(DisplayName = "采购订单号")] + public string PurchaseOrderNo { get; set; } + /// + /// 采购订单行项目 + /// + [ExporterHeader(DisplayName = "采购订单行项目")] + public string PurchaseOrderNoItem { get; set; } + /// + /// 采购订单文本 + /// + [ExporterHeader(DisplayName = "采购订单文本")] + public string PurchaseOrderNoText { get; set; } + /// + /// 收货数量 + /// + [ExporterHeader(DisplayName = "收货数量")] + public decimal ReceiptQty { get; set; } + + /// + /// 开票数量 + /// + [ExporterHeader(DisplayName = "开票数量")] + public decimal InvoicedQty { get; set; } + /// + /// 不含税金额 + /// + [ExporterHeader(DisplayName = "不含税金额")] + public decimal AmountNoTax { get; set; } + /// + /// 采购价格不含税 + /// + [ExporterHeader(DisplayName = "采购价格不含税")] + public decimal PurchasePriceNoTax { get; set; } + /// + /// 科目号 + /// + [ExporterHeader(DisplayName = "科目号")] + public string AccountNum { get; set; } + /// + /// 物料代码 + /// + [ExporterHeader(DisplayName = "物料代码")] + public string MaterialCode { get; set; } + /// + /// 物料描述 + /// + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDesc { get; set; } + /// + /// 日期 + /// + [ExporterHeader(DisplayName = "日期")] + public DateTime SpareDate { get; set; } + /// + /// 交货单号 + /// + [ExporterHeader(DisplayName = "交货单号")] + public string DeliveryOrderNo { get; set; } + /// + /// 交货行号 + /// + [ExporterHeader(DisplayName = "交货行号")] + public string DeliveryLineNum { get; set; } + /// + /// 批次号 + /// + [ExporterHeader(DisplayName = "批次号")] + public string BatchNo { get; set; } + /// + /// 单位 + /// + [ExporterHeader(DisplayName = "单位")] + public string Unit { get; set; } + /// + /// 税率 + /// + [ExporterHeader(DisplayName = "税率")] + public decimal TaxRate { get; set; } + /// + /// 税码 + /// + [ExporterHeader(DisplayName = "税码")] + public string TaxCode { get; set; } + /// + /// 德国发票号 + /// + [ExporterHeader(DisplayName = "德国发票号")] + public string GermanInvoiceNo { get; set; } + /// + /// 工厂 + /// + [ExporterHeader(DisplayName = "工厂")] + public string Factory { get; set; } + /// + /// 工厂名称 + /// + [ExporterHeader(DisplayName = "工厂名称")] + public string FactoryName { get; set; } + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs new file mode 100644 index 00000000..cd8af4fc --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs @@ -0,0 +1,129 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + public class WMSSparePartImportDto + { + + /// + /// 行号 + /// + [ImporterHeader(Name = "行号")] + public string LineNumber { set; get; } + + + /// + /// 采购类型 + /// + [ImporterHeader(Name = "采购类型")] + public string PurchaseType { get; set; } + + /// + /// 采购订单号 + /// + [ImporterHeader(Name = "采购订单号", FixAllSpace = true)] + public string PurchaseOrderNo { get; set; } + /// + /// 采购订单行项目 + /// + [ImporterHeader(Name = "采购订单行项目")] + public string PurchaseOrderNoItem { get; set; } + /// + /// 采购订单文本 + /// + [ImporterHeader(Name = "采购订单文本")] + public string PurchaseOrderNoText { get; set; } + /// + /// 收货数量 + /// + [ImporterHeader(Name = "收货数量")] + public decimal ReceiptQty { get; set; } + + /// + /// 开票数量 + /// + [ImporterHeader(Name = "开票数量")] + public decimal InvoicedQty { get; set; } + /// + /// 不含税金额 + /// + [ImporterHeader(Name = "不含税金额")] + public decimal AmountNoTax { get; set; } + /// + /// 采购价格不含税 + /// + [ImporterHeader(Name = "采购价格不含税")] + public decimal PurchasePriceNoTax { get; set; } + /// + /// 科目号 + /// + [ImporterHeader(Name = "科目号", FixAllSpace = true)] + public string AccountNum { get; set; } + /// + /// 物料代码 + /// + [ImporterHeader(Name = "物料代码", FixAllSpace = true)] + public string MaterialCode { get; set; } + /// + /// 物料描述 + /// + [ImporterHeader(Name = "物料描述")] + public string MaterialDesc { get; set; } + /// + /// 日期 + /// + [ImporterHeader(Name = "日期")] + public DateTime SpareDate { get; set; } + /// + /// 交货单号 + /// + [ImporterHeader(Name = "交货单号", FixAllSpace = true)] + public string DeliveryOrderNo { get; set; } + /// + /// 交货行号 + /// + [ImporterHeader(Name = "交货行号")] + public string DeliveryLineNum { get; set; } + /// + /// 批次号 + /// + [ImporterHeader(Name = "批次号")] + public string BatchNo { get; set; } + /// + /// 单位 + /// + [ImporterHeader(Name = "单位")] + public string Unit { get; set; } + /// + /// 税率 + /// + [ImporterHeader(Name = "税率")] + public decimal TaxRate { get; set; } + /// + /// 税码 + /// + [ImporterHeader(Name = "税码")] + public string TaxCode { get; set; } + /// + /// 德国发票号 + /// + [ImporterHeader(Name = "德国发票号")] + public string GermanInvoiceNo { get; set; } + /// + /// 工厂 + /// + [ImporterHeader(Name = "工厂")] + public string Factory { get; set; } + /// + /// 工厂名称 + /// + [ImporterHeader(Name = "工厂名称")] + public string FactoryName { get; set; } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs new file mode 100644 index 00000000..bc090dda --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs @@ -0,0 +1,129 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + public class WMSSparePartRequestDto : RequestDtoBase + { + /// + ///年 + /// + public string Year { get; set; } + /// + /// 期间 + /// + public string Period { set; get; } + /// + /// 版本号 + /// + public string Version { set; get; } + + /// + /// 行号 + /// + public string LineNumber { set; get; } + + + /// + /// 采购类型 + /// + public string PurchaseType { get; set; } + + /// + /// 采购订单号 + /// + public string PurchaseOrderNo { get; set; } + /// + /// 采购订单行项目 + /// + public string PurchaseOrderNoItem { get; set; } + /// + /// 采购订单文本 + /// + public string PurchaseOrderNoText { get; set; } + /// + /// 收货数量 + /// + public decimal ReceiptQty { get; set; } + + /// + /// 开票数量 + /// + public decimal InvoicedQty { get; set; } + /// + /// 不含税金额 + /// + public decimal AmountNoTax { get; set; } + /// + /// 采购价格不含税 + /// + public decimal PurchasePriceNoTax { get; set; } + /// + /// 科目号 + /// + public string AccountNum { get; set; } + /// + /// 物料代码 + /// + public string MaterialCode { get; set; } + /// + /// 物料描述 + /// + public string MaterialDesc { get; set; } + /// + /// 日期 + /// + public DateTime SpareDate { get; set; } + /// + /// 交货单号 + /// + public string DeliveryOrderNo { get; set; } + /// + /// 交货行号 + /// + public string DeliveryLineNum { get; set; } + /// + /// 批次号 + /// + public string BatchNo { get; set; } + /// + /// 单位 + /// + public string Unit { get; set; } + /// + /// 税率 + /// + public decimal TaxRate { get; set; } + /// + /// 税码 + /// + public string TaxCode { get; set; } + /// + /// 德国发票号 + /// + public string GermanInvoiceNo { get; set; } + /// + /// 工厂 + /// + public string Factory { get; set; } + /// + /// 工厂名称 + /// + public string FactoryName { get; set; } + /// + /// 备注 + /// + public string Extend { set; get; } + + public virtual Guid ParentId { get; set; } + public virtual Guid BranchId { get; set; } + + public virtual Guid UserId { get; set; } + + public virtual int FileType { get; set; } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs new file mode 100644 index 00000000..b2d78b86 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared; +using Win.Sfs.Shared.DtoBase; + +namespace Win.Sfs.SettleAccount.Entities.WMSSparePart +{ + /// + /// SettleAccountVersion + /// + public class WMSSparePartVersionDtoBase : CreateOrUpdateEntityDtoBase + { + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; private set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + + + } + + + + public class WMSSparePartVersionDto : AuditedEntityDtoBase, IBranch + { + public string Year { get; set; } + /// + /// 期间 + /// + public string Period { get; set; } + /// + /// 版本号 + /// + public string Version { get; set; } + + /// + /// 客户号 + /// + public string CustomerCode { set; get; } + public Guid BranchId { get; set; } + } + + public class WMSSparePartVersionCreateDto : WMSSparePartVersionDtoBase + { } + public class WMSSparePartVersionUpdateDto : WMSSparePartVersionDtoBase + { } + public class WMSSparePartVersionRequestDto : RequestDtoBase, IBranch + { + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; private set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + public Guid BranchId { get; set; } + } + + public class WMSSparePartVersionImportDto + { + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; private set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 20ed6029..17a52d32 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -2308,6 +2308,26 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 大众备件发货 + + + + + 大众备件导入-版本 + + + + + 大众看板发货 + + + + + 大众看板发货-版本 + + 大众看板导入 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs index c2e7c21c..d74d7c30 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs @@ -79,6 +79,10 @@ using Win.Sfs.SettleAccount.Entities.VWKanBan; using Win.Sfs.SettleAccount.Entities.VWScrapClaims; using Win.Sfs.SettleAccount.Entities.VWSparePart; using Win.Sfs.SettleAccount.Entities.VWKanBanVersion; +using Win.Sfs.SettleAccount.Entities.WMS_KanBan; +using Win.Sfs.SettleAccount.Entities.WMSKanBan; +using Win.Sfs.SettleAccount.Entities.WMS_SparePart; +using Win.Sfs.SettleAccount.Entities.WMSSparePart; namespace Win.Sfs.SettleAccount { @@ -208,12 +212,71 @@ namespace Win.Sfs.SettleAccount CreateMapUnSettleAccount(); CreateMapUnSettleAccountVersion(); + //大众看板发货 + CreateMapWMSVWKanBan(); + CreateMapWMSVWKanBanVersion(); + //大众备件发货 + CreateMapWMSSparePart(); + CreateMapWMSSparePartVersion(); #endregion } #region PG-派格映射 + /// + /// 大众备件发货 + /// + private void CreateMapWMSSparePart() + + { + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + } + + /// + /// 大众备件导入-版本 + /// + private void CreateMapWMSSparePartVersion() + + { + CreateMap().ReverseMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + } + + /// + /// 大众看板发货 + /// + private void CreateMapWMSVWKanBan() + + { + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap() + .ForMember(dest => dest.SettleInputDate, + opt => opt.MapFrom(src => DateTime.ParseExact(src.SettleInputDate, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture))) + .ForMember(dest => dest.SettleDate, + opt => opt.MapFrom(src => DateTime.ParseExact(src.SettleDate, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture))); + CreateMap().ReverseMap(); + } + + /// + /// 大众看板发货-版本 + /// + private void CreateMapWMSVWKanBanVersion() + { + CreateMap().ReverseMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + } /// /// 大众看板导入 /// @@ -246,7 +309,6 @@ namespace Win.Sfs.SettleAccount /// 大众发票导入 /// private void CreateMapInvoice() - { CreateMap().ReverseMap(); CreateMap().ReverseMap(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs new file mode 100644 index 00000000..169d875e --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Domain.Services; + +namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan +{ + public class WMSKanBanManager : DomainService + { + private readonly ISettleAccountBranchEfCoreRepository _repository; + private readonly ISettleAccountBranchEfCoreRepository _versionRepository; + public WMSKanBanManager( + ISettleAccountBranchEfCoreRepository repository, + ISettleAccountBranchEfCoreRepository versionRepository + + + ) + { + _versionRepository = versionRepository; + _repository = repository; + + + } + + + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs new file mode 100644 index 00000000..9af5b35b --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs @@ -0,0 +1,163 @@ +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.WMS_KanBan +{ + public class WMSKanBanSettle : FullAuditedAggregateRootBase, ISettleAccountEntityBase + { + /// + ///年度 + /// + public string Year { get; protected set; } + + /// + /// 期间 + /// + public string Period { set; get; } + + /// + /// 版本 + /// + public string Version { set; get; } + /// + /// 看板条码号 + /// + public string Kanban { set; get; } + + /// + /// 入库关联号 + /// + + public string Relation { set; get; } + /// + /// 工厂 + /// + public string Factory { set; get; } + /// + /// 零件号 + /// + public string MaterialCode { set; get; } + /// + /// 零件类型 + /// + public string PartType { set; get; } + /// + /// 供应商编码 + /// + public string SupplierCode { set; get; } + /// + /// R3入库时间 + /// + public DateTime SettleInputDate { set; get; } + + + /// + /// 批次 + /// + public string Batch { set; get; } + + + /// + /// 入库结算标识 + /// + public string Flag { set; get; } + /// + /// 数量 + /// + public decimal Qty { set; get; } + + + /// + /// R3结算时间 + /// + public DateTime SettleDate { set; get; } + /// + /// 结算状态 + /// + public string State { set; get; } + + /// + /// WMS交货单 + /// + public string WMSDeliveryNote { set; get; } + + /// + /// WMS发货状态 + /// + public string WMSDeliverGoodsState { set; get; } + + /// + /// 看板结算状态 + /// + public string WMSKanBanState { set; get; } + + /// + /// 备注 + /// + + public string Extend { set; get; } + + public Guid ParentId { get; protected set; } + + public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId) + { + Period = peroid; + Year = year; + Id = guid; + Version = version; + BranchId = branchId; + ParentId = parentId; + } + public WMSKanBanSettle() + { } + public WMSKanBanSettle( + Guid id, + Guid branchId, + string year, + string version, + string kanban, + string relation, + string factory, + string materialCode, + string partType, + DateTime settleInputDate, + string supplierCode, + decimal qty, + string batch, + string flag, + DateTime settleDate, + string state, + Guid parentId, + //DateTime creationTime, + Guid guid) : base(id) + { + BranchId = branchId; + Year = year; + Version = version; + Kanban = kanban; + Relation = relation; + Factory = factory; + MaterialCode = materialCode; + PartType = partType; + SettleInputDate = settleInputDate; + SupplierCode = supplierCode; + Qty = qty; + Batch = batch; + Flag = flag; + SettleDate = settleDate; + State = state; + ParentId = parentId; + //CreationTime = creationTime; + CreatorId = guid; + } + + + + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs new file mode 100644 index 00000000..84b4f406 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs @@ -0,0 +1,47 @@ +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.WMS_KanBan +{ + public class WMSKanBanVersion : FullAuditedAggregateRootBase, ISettleAccountEntityBase + { + + public WMSKanBanVersion() + { } + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + + + public WMSKanBanVersion( + Guid id, + Guid branchId, + string year, string period, string version, string customerCode) : base(id) + { + BranchId = branchId; + Year = year; + Period = period; + Version = version; + CustomerCode = customerCode; + + } + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs new file mode 100644 index 00000000..6497f2c3 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs @@ -0,0 +1,215 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DomainBase; + +namespace Win.Sfs.SettleAccount.Entities.WMS_SparePart +{ + public class WMSSparePart : FullAuditedAggregateRootBase, ISettleAccountEntityBase + { + public WMSSparePart() + { } + + public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version) + { + Period = peroid; + Year = year; + Id = guid; + Version = version; + BranchId = branchId; + } + public WMSSparePart(Guid Id, string year, string period, string version, string lineNumber, + string purchaseType, string purchaseOrderNo, string purchaseOrderNoItem, string purchaseOrderNoText, + decimal receiptQty, decimal invoicedQty, decimal amountNoTax, decimal purchasePriceNoTax, + string accountNum, string materialCode, string materialDesc, DateTime spareDate, string deliveryOrderNo, + string deliveryLineNum, string batchNo, string unit, decimal taxRate, string taxCode, string factory + + ) : base(Id) + { + Year = year; + Period = period; + Version = version; + LineNumber = lineNumber; + PurchaseType = purchaseType; + PurchaseOrderNo = purchaseOrderNo; + PurchaseOrderNoItem = purchaseOrderNoItem; + PurchaseOrderNoText = purchaseOrderNoText; + ReceiptQty = receiptQty; + InvoicedQty = invoicedQty; + AmountNoTax = amountNoTax; + PurchasePriceNoTax = purchasePriceNoTax; + AccountNum = accountNum; + MaterialCode = materialCode; + MaterialDesc = materialDesc; + SpareDate = spareDate; + DeliveryOrderNo = deliveryOrderNo; + DeliveryLineNum = deliveryLineNum; + BatchNo = batchNo; + Unit = unit; + TaxRate = taxRate; + TaxCode = taxCode; + Factory = factory; + } + + //行号 采购类型 采购订单号 采购订单行项目 采购订单文本 收货数量 开票数量 不含税金额 采购价格不含税 + //科目号 物料代码 物料描述 日期 交货单号 交货行号 批次号 单位 税率 税码 + //德国发票号 AP_REQUISITION_MIMRS.GERMANY_INVOCE_AMOUNT 借贷 PO币种 工厂 工厂名称 BM 单号 + + /// + ///年 + /// + [Display(Name = "年")] + public string Year { get; set; } + /// + /// 期间 + /// + [Display(Name = "期间")] + public string Period { set; get; } + /// + /// 版本号 + /// + [Display(Name = "版本号")] + public string Version { set; get; } + + /// + /// 行号 + /// + [Display(Name = "行号")] + public string LineNumber { set; get; } + + + /// + /// 采购类型 + /// + [Display(Name = "采购类型")] + public string PurchaseType { get; set; } + + /// + /// 采购订单号 + /// + [Display(Name = "采购订单号")] + public string PurchaseOrderNo { get; set; } + /// + /// 采购订单行项目 + /// + [Display(Name = "采购订单行项目")] + public string PurchaseOrderNoItem { get; set; } + /// + /// 采购订单文本 + /// + [Display(Name = "采购订单文本")] + public string PurchaseOrderNoText { get; set; } + /// + /// 收货数量 + /// + [Display(Name = "收货数量")] + public decimal ReceiptQty { get; set; } + + /// + /// 开票数量 + /// + [Display(Name = "开票数量")] + public decimal InvoicedQty { get; set; } + /// + /// 不含税金额 + /// + [Display(Name = "不含税金额")] + public decimal AmountNoTax { get; set; } + /// + /// 采购价格不含税 + /// + [Display(Name = "采购价格不含税")] + public decimal PurchasePriceNoTax { get; set; } + /// + /// 科目号 + /// + [Display(Name = "科目号")] + public string AccountNum { get; set; } + /// + /// 物料代码 + /// + [Display(Name = "物料代码")] + public string MaterialCode { get; set; } + /// + /// 物料描述 + /// + [Display(Name = "物料描述")] + public string MaterialDesc { get; set; } + /// + /// 日期 + /// + [Display(Name = "日期")] + public DateTime SpareDate { get; set; } + /// + /// 交货单号 + /// + [Display(Name = "交货单号")] + public string DeliveryOrderNo { get; set; } + /// + /// 交货行号 + /// + [Display(Name = "交货行号")] + public string DeliveryLineNum { get; set; } + /// + /// 批次号 + /// + [Display(Name = "批次号")] + public string BatchNo { get; set; } + /// + /// 单位 + /// + [Display(Name = "单位")] + public string Unit { get; set; } + /// + /// 税率 + /// + [Display(Name = "税率")] + public decimal TaxRate { get; set; } + /// + /// 税码 + /// + [Display(Name = "税码")] + public string TaxCode { get; set; } + /// + /// 德国发票号 + /// + [Display(Name = "德国发票号")] + public string GermanInvoiceNo { get; set; } + /// + /// 工厂 + /// + [Display(Name = "工厂")] + public string Factory { get; set; } + /// + /// 工厂名称 + /// + [Display(Name = "工厂名称")] + public string FactoryName { get; set; } + /// + /// 备注 + /// + [Display(Name = "备注")] + public string Extend { set; get; } + + /// + /// WMS交货单 + /// + public string WMSDeliveryNote { set; get; } + + /// + /// WMS发货状态 + /// + public string WMSDeliverGoodsState { set; get; } + + /// + /// 看板结算状态 + /// + public string WMSKanBanState { set; get; } + + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs new file mode 100644 index 00000000..8c96e797 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs @@ -0,0 +1,47 @@ +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.WMS_SparePart +{ + public class WMSSparePartVersion : FullAuditedAggregateRootBase, ISettleAccountEntityBase + { + + public WMSSparePartVersion() + { } + + public string Year { get; private set; } + /// + /// 期间 + /// + public string Period { get; private set; } + /// + /// 版本号 + /// + public string Version { get; set; } + + /// + /// 客户号 + /// + public string CustomerCode { private set; get; } + + + public WMSSparePartVersion( + Guid id, + Guid branchId, + string year, string period, string version, string customerCode) : base(id) + { + BranchId = branchId; + Year = year; + Period = period; + Version = version; + CustomerCode = customerCode; + + } + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs index f33f1b1d..f8c0f600 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -65,6 +65,7 @@ using Win.Sfs.SettleAccount.Entities.SecMatch; using Win.Sfs.SettleAccount.Entities.VWKanBan; using Win.Sfs.SettleAccount.Entities.VWScrapClaims; using Win.Sfs.SettleAccount.Entities.VWSparePart; +using Win.Sfs.SettleAccount.Entities.WMS_KanBan; namespace Win.Sfs.SettleAccount { @@ -266,26 +267,38 @@ namespace Win.Sfs.SettleAccount #region 派格结算 + //大众看板明细导入 builder.ConfigureKanBan(options); builder.ConfigureKanBanVersion(options); + //大众发票导入 builder.ConfigureInvoice(options); builder.ConfigureInvoiceVersion(options); + //CP7报废和索赔 builder.ConfigureScrapClaims(options); builder.ConfigureScrapClaimsVersion(options); + //大众备件 builder.ConfigureSparePart(options); builder.ConfigureSparePartVersion(options); + //大众FIS未结明细 builder.ConfigureUnSettleAccount(options); builder.ConfigureUnSettleAccountVersion(options); + //大众准时化结算明细导入-已结 builder.ConfigureSettleAccount(options); builder.ConfigureSettleAccountVersion(options); + //大众看板发货 + builder.ConfigureWMSKanBan(options); + builder.ConfigureWMSKanBanVersion(options); + //大众备件发货 + builder.ConfigureWMSSparePart(options); + builder.ConfigureWMSSparePartVersion(options); #endregion @@ -293,6 +306,123 @@ namespace Win.Sfs.SettleAccount #region PG-派格 + + /// + /// 大众备件发货 + /// + /// + /// + private static void ConfigureWMSSparePart(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + + b.ToTable($"{options.TablePrefix}_WMSSparePart", options.Schema); + + b.ConfigureByConvention(); + b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength); + + b.Property(x => x.LineNumber).HasMaxLength(50); + b.Property(x => x.PurchaseType).HasMaxLength(50); + b.Property(x => x.PurchaseOrderNo).IsRequired().HasMaxLength(50); + b.Property(x => x.PurchaseOrderNoItem).HasMaxLength(50); + b.Property(x => x.PurchaseOrderNoText).HasMaxLength(50); + + b.Property(x => x.ReceiptQty).IsRequired(); + b.Property(x => x.InvoicedQty).IsRequired(); + b.Property(x => x.AmountNoTax).IsRequired(); + b.Property(x => x.PurchasePriceNoTax).IsRequired(); + + b.Property(x => x.AccountNum).HasMaxLength(50); + b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150); + b.Property(x => x.MaterialDesc).HasMaxLength(50); + b.Property(x => x.SpareDate); + b.Property(x => x.DeliveryOrderNo).IsRequired().HasMaxLength(50); + b.Property(x => x.DeliveryLineNum).HasMaxLength(50); + b.Property(x => x.BatchNo).HasMaxLength(50); + b.Property(x => x.Unit).HasMaxLength(50); + b.Property(x => x.TaxRate); + b.Property(x => x.TaxCode); + b.Property(x => x.GermanInvoiceNo).HasMaxLength(100); + b.Property(x => x.Factory).HasMaxLength(50); + b.Property(x => x.FactoryName).HasMaxLength(50); + b.Property(x => x.Extend).HasMaxLength(250); + //创建索引（没有版本一说） + b.HasIndex(x => new { x.PurchaseOrderNo, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); + }); + } + + /// + /// 大众备件发货-版本 + /// + /// + /// + private static void ConfigureWMSSparePartVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WMSSparePart_Version", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); + }); + + } + + /// + /// 大众看板发货 + /// + /// + /// + private static void ConfigureWMSKanBan(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + + b.ToTable($"{options.TablePrefix}_WMSKanBanSettle", options.Schema); + + b.ConfigureByConvention(); + b.Property(x => x.Kanban).IsRequired().HasMaxLength(150);//必填项 + b.Property(x => x.Relation).HasMaxLength(100); + b.Property(x => x.Factory).HasMaxLength(50); + b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150); + b.Property(x => x.PartType).HasMaxLength(50); + b.Property(x => x.SupplierCode).HasMaxLength(50); + b.Property(x => x.Batch).HasMaxLength(50); + b.Property(x => x.Flag).HasMaxLength(50); + //创建组合索引 + b.HasIndex(x => new { x.Kanban, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); + + }); + } + /// + /// 大众看板发货-版本 + /// + /// + /// + private static void ConfigureWMSKanBanVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WMSKanBanSettle_Version", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); + }); + } + /// /// 大众看板结算明细导入表结构 /// @@ -315,8 +445,8 @@ namespace Win.Sfs.SettleAccount b.Property(x => x.SupplierCode).HasMaxLength(50); b.Property(x => x.Batch).HasMaxLength(50); b.Property(x => x.Flag).HasMaxLength(50); - //创建索引 - b.HasIndex(x => new { x.Kanban, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); + //创建组合索引 + b.HasIndex(x => new {x.Version, x.Kanban, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); }); } @@ -473,6 +603,8 @@ namespace Win.Sfs.SettleAccount b.Property(x => x.Factory).HasMaxLength(50); b.Property(x => x.FactoryName).HasMaxLength(50); b.Property(x => x.Extend).HasMaxLength(250); + //创建索引 + b.HasIndex(x => new { x.Version, x.PurchaseOrderNo, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); }); } diff --git a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csprojAssemblyReference.cache b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csprojAssemblyReference.cache new file mode 100644 index 00000000..d5e121ec Binary files /dev/null and b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csprojAssemblyReference.cache differ diff --git a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csprojAssemblyReference.cache b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csprojAssemblyReference.cache new file mode 100644 index 00000000..5bb4f3d2 Binary files /dev/null and b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csprojAssemblyReference.cache differ diff --git a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csprojAssemblyReference.cache b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csprojAssemblyReference.cache new file mode 100644 index 00000000..e0e99e6f Binary files /dev/null and b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csprojAssemblyReference.cache differ