diff --git a/.gitignore b/.gitignore index bfcbf6ee..7657db0b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ dist/ .vs/ bin/ obj/ +[Ll]ogs/ *.suo *.user *.db diff --git a/code/src/AuthServer/AuthServer.Host/appsettings.json b/code/src/AuthServer/AuthServer.Host/appsettings.json index ffb0644f..1a4089cd 100644 --- a/code/src/AuthServer/AuthServer.Host/appsettings.json +++ b/code/src/AuthServer/AuthServer.Host/appsettings.json @@ -1,15 +1,25 @@ { "ConnectionStrings": { - // "Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;", - "Default": "Server=192.168.0.203;Database=ABP;User ID=sa;Password=Microsoft@2021;" + "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True" }, + "CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307", "ElasticSearch": { "Url": "http://localhost:9200" }, - "CorsOrigins": "http://localhost:9528", "Redis": { "Configuration": "127.0.0.1" }, + "RabbitMQ": { + "Connections": { + "Default": { + "HostName": "localhost" + } + }, + "EventBus": { + "ClientName": "MsDemo_AuthServer", + "ExchangeName": "MsDemo" + } + }, "Logging": { "LogLevel": { "Default": "Warning" diff --git a/code/src/Modules/BaseService/BaseService.Host/appsettings.json b/code/src/Modules/BaseService/BaseService.Host/appsettings.json index 7b616c76..8050d6cc 100644 --- a/code/src/Modules/BaseService/BaseService.Host/appsettings.json +++ b/code/src/Modules/BaseService/BaseService.Host/appsettings.json @@ -1,15 +1,12 @@ { "AuthServer": { - "Authority": "http://localhost:10100", - "ApiName": "IdentityService" + "Authority": "http://dev.ccwin-in.com:10580" }, "App": { - "CorsOrigins": "http://localhost:9527,http://localhost:9528" + "CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307" }, "ConnectionStrings": { - "Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008" - // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;User ID=sa;Password=1q2w!@#;" - //"Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;" + "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True" }, "ElasticSearch": { "Url": "http://localhost:9200" @@ -22,6 +19,7 @@ "Default": "Warning" } }, +<<<<<<< HEAD //"Settings": { // "Abp.Localization.DefaultLanguage": "zh-Hans", // "Abp.Identity.Password.RequireNonAlphanumeric": "false", //ȥ�����ĸ���� @@ -34,4 +32,9 @@ // "Abp.Identity.Lockout.MaxFailedAccessAttempts": "3" //}, "AllowedHosts": "*" +======= + "AllowedHosts": "*", + "RePassword": "111111" + +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 } diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj index c981c795..1672c209 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj @@ -12,7 +12,11 @@ ..\..\..\.. net5.0 True +<<<<<<< HEAD false +======= + false +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json index 3e49936b..29dfea13 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json @@ -2,26 +2,10 @@ "App": { "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088" }, - //"ConnectionStrings": { - // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#", - // "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService1;user id=sa;Password=1q2w!@#;", - // "Wms": "Server=192.168.0.140;Database=CPAT_WMS_TEST;user id=sa;password=Microsoft2008;" - //}, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=ABP;User ID=sa;Password=asdasd1977;", - "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService;user id=sa;password=asdasd1977;", - "Wms": "Server=127.0.0.1;Database=CPAT_WMS_TEST;user id=sa;password=asdasd1977;" + "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True", + "SettleAccountService": "Server=dev.ccwin-in.com,13319;Database=SettleAccountService;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;" }, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - - - "Serilog": { "Using": [], @@ -84,14 +68,8 @@ }, - - - - - - "AuthServer": { - "Authority": "http://149.223.116.5:8066", + "Authority": "http://dev.ccwin-in.com:10580", "AlwaysAllowAuthorization": false }, @@ -104,24 +82,7 @@ "ElasticSearch": { "Url": "http://localhost:9200" - }, - - "RemoteServices": { - "Default": { - "BaseUrl": "http://149.223.116.5:8091/", - "UseCurrentAccessToken": "true" - } - }, - "IdentityClients": { - "Default": { - "GrantType": "client_credentials", - "ClientId": "business-app", - "ClientSecret": "1q2w3e*", - "Authority": "http://149.223.116.5:8066", - "Scope": "InternalGateway IdentityService SettleAccount" - } } - } \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs index c3f85f31..aa60d416 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win.Sfs.SettleAccount.Entities.Boms; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.Shared.ApplicationBase; namespace Win.Sfs.SettleAccount.Boms { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs deleted file mode 100644 index 21ec3572..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - public class EstimatedInventoryDetailCreateDto : EstimatedInventoryDetailDtoBase, IBranch - { - public virtual Guid BranchId { get ; set ; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs deleted file mode 100644 index f7008352..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - public class EstimatedInventoryDetailDto : AuditedEntityDtoBase, IBranch - { - - - public string Version { set; get; } - - /// - ///年度 - /// - public string Year { get;set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - /// - /// 物料凭证号 - /// - public virtual string MaterialDocument { get; set;} - - - - public virtual string MaterialDocumentLine { get; set; } - - /// - /// 外部单号 - /// - public virtual string BillNumber { get; set;} - - /// - /// 记账日期 - /// - public virtual DateTime PostingDate { get; set;} - - - - - public virtual string Factory { set; get; } - - - /// - /// 物料编号 - /// - public virtual string MaterialCode { get; set;} - - - - /// - /// 物料描述 - /// - public virtual string MaterialDesc { get; set;} - - - /// - /// 存储位置 - /// - public virtual string Storagelocation { get; set;} - - - /// - /// 收货数量 - /// - public virtual decimal ReceiveQty { get;set;} - - - /// - /// 发票数量 - /// - public virtual decimal InvoiceQty { get; set;} - - /// - /// 供应商编号 - /// - public virtual string SupplierCode { get; set;} - - /// - /// 供应商描述 - /// - public virtual string SupplierDesc { get; set;} - - - /// - /// 采购凭证 - /// - public virtual string PurchaseDocument { get; set;} - - - /// - /// 采购行项 - /// - public virtual string PurchaseLine { get; set;} - - - /// - /// 来源 - /// - public virtual string Source { get; set;} - - - - /// - /// 存储扩展字段 - /// - public virtual string Extend1 { get; set;} - public virtual Guid BranchId { get; set; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs deleted file mode 100644 index d2cc349d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs +++ /dev/null @@ -1,118 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - public class EstimatedInventoryDetailDtoBase : CreateOrUpdateEntityDtoBase - { - - - - - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - - /// - /// 物料凭证号 - /// - public virtual string MaterialDocument { get; set; } - - public virtual string MaterialDocumentLine { get; set; } - - - /// - /// 外部单号 - /// - public virtual string BillNumber { get; set; } - - /// - /// 记账日期 - /// - public virtual DateTime PostingDate { get; set; } - - - /// - /// 物料编号 - /// - public virtual string MaterialCode { get; set; } - - - - /// - /// 物料描述 - /// - public virtual string MaterialDesc { get; set; } - - - /// - /// 存储位置 - /// - public virtual string Storagelocation { get; set; } - - - /// - /// 收货数量 - /// - public virtual decimal ReceiveQty { get;set; } - - - /// - /// 发票数量 - /// - public virtual decimal InvoiceQty { get; set; } - - /// - /// 供应商编号 - /// - public virtual string SupplierCode { get; set; } - - /// - /// 供应商描述 - /// - public virtual string SupplierDesc { get; set; } - - - /// - /// 采购凭证 - /// - public virtual string PurchaseDocument { get; set; } - - - /// - /// 采购行项 - /// - public virtual string PurchaseLine { get; set; } - - - /// - /// 来源 - /// - public virtual string Source { get; set; } - - - - /// - /// 存储扩展字段 - /// - public virtual string Extend1 { get; set; } - - - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs deleted file mode 100644 index 6b9ca689..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs +++ /dev/null @@ -1,151 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - /// - /// 应付暂估收获明细 - /// - public class EstimatedInventoryDetailExportDto - { - [ExporterHeader(DisplayName = "工厂")] - - public virtual string Factory { get; set; } - - [ExporterHeader(DisplayName = "期间")] - - public string Version { set; get; } - - /// - /// 物料凭证号（收获单号） - /// - [ExporterHeader(DisplayName = "物料凭证号")] - - public virtual string MaterialDocument { get; set; } - - - - /// - /// 物料凭证号（收获单号） - /// - [ExporterHeader(DisplayName = "物料凭证行项号")] - - - public virtual string MaterialDocumentLine { get; set; } - - /// - /// 外部单号 - /// - [ExporterHeader(DisplayName = "外部单号")] - - public virtual string BillNumber { get; set; } - - /// - /// 记账日期（收货日期） - /// - [ExporterHeader(DisplayName = "记账日期")] - - public virtual DateTime PostingDate { get; set; } - - - /// - /// 物料编号 - /// - [ExporterHeader(DisplayName = "物料号")] - - public virtual string MaterialCode { get; set; } - - - - /// - /// 物料描述 - /// - - [ExporterHeader(DisplayName = "物料描述")] - - public virtual string MaterialDesc { get; set; } - - - /// - /// 存储地点 - /// - [ExporterHeader(DisplayName = "存储地点")] - - public virtual string Storagelocation { get; set; } - - - /// - /// 收货数量 - /// - [ExporterHeader(DisplayName = "收货数量")] - - public virtual decimal ReceiveQty { get;set; } - - - /// - /// 发票数量 - /// - /// [ExporterHeader(Name = "描述")] - [ExporterHeader(DisplayName = "发票数量")] - - - public virtual decimal InvoiceQty { get; set; } - - /// - /// 供应商 - /// - [ExporterHeader(DisplayName = "供应商")] - - public virtual string SupplierCode { get; set; } - - /// - /// 供应商描述 - /// - [ExporterHeader(DisplayName = "供应商描述")] - - public virtual string SupplierDesc { get; set; } - - - /// - /// 采购凭证号 - /// - - [ExporterHeader(DisplayName = "采购凭证号")] - - public virtual string PurchaseDocument { get; set; } - - - /// - /// 采购凭证行 - /// - [ExporterHeader(DisplayName = "采购凭证行")] - - public virtual string PurchaseLine { get; set; } - - - /// - /// 来源 - /// - /// - [ExporterHeader(DisplayName = "来源")] - - public virtual string Source { get; set; } - - - - ///// - ///// 存储扩展字段 - ///// - //public virtual string Extend1 { get; set; } - //public virtual Guid BranchId { get; set; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs deleted file mode 100644 index 73c50b14..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs +++ /dev/null @@ -1,169 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - /// - /// 应付暂估收获明细 - /// - public class EstimatedInventoryDetailImportDto - { - - - [ImporterHeader(Name = "年度")] - [Required(ErrorMessage = "{0}是必填项")] - /// - ///年度 - /// - public string Year { get; set; } - [ImporterHeader(Name = "期间")] - [Required(ErrorMessage = "{0}是必填项")] - public string Period { set; get; } - - - - - /// - /// 物料凭证号（收获单号） - /// - [ImporterHeader(Name = "物料凭证号")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - - public virtual string MaterialDocument { get; set; } - - - - /// - /// 物料凭证号（收获单号） - /// - [ImporterHeader(Name = "物料凭证行项号")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - - public virtual string MaterialDocumentLine { get; set; } - - /// - /// 外部单号 - /// - [ImporterHeader(Name = "外部单号")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string BillNumber { get; set; } - - /// - /// 记账日期（收货日期） - /// - [ImporterHeader(Name = "记账日期")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual DateTime PostingDate { get; set; } - - - /// - /// 物料编号 - /// - [ImporterHeader(Name = "物料号")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string MaterialCode { get; set; } - - - - /// - /// 物料描述 - /// - - [ImporterHeader(Name = "物料描述")] - - public virtual string MaterialDesc { get; set; } - - - /// - /// 存储地点 - /// - [ImporterHeader(Name = "存储地点")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string Storagelocation { get; set; } - - - /// - /// 收货数量 - /// - [ImporterHeader(Name = "收货数量")] - [Required(ErrorMessage = "{0}是必填项")] - - public virtual decimal ReceiveQty { get;set; } - - - /// - /// 发票数量 - /// - /// [ImporterHeader(Name = "描述")] - [ImporterHeader(Name = "发票数量")] - [Required(ErrorMessage = "{0}是必填项")] - - public virtual decimal InvoiceQty { get; set; } - - /// - /// 供应商 - /// - [ImporterHeader(Name = "供应商")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string SupplierCode { get; set; } - - /// - /// 供应商描述 - /// - [ImporterHeader(Name = "供应商描述")] - - public virtual string SupplierDesc { get; set; } - - - /// - /// 采购凭证号 - /// - - [ImporterHeader(Name = "采购凭证号")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string PurchaseDocument { get; set; } - - - /// - /// 采购凭证行 - /// - [ImporterHeader(Name = "采购凭证行")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string PurchaseLine { get; set; } - - - /// - /// 来源 - /// - /// - [ImporterHeader(Name = "来源")] - - public virtual string Source { get; set; } - - - - /// - /// 存储扩展字段 - /// - public virtual string Extend1 { get; set; } - public virtual Guid BranchId { get; set; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs deleted file mode 100644 index 7ff01ffc..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - public class EstimatedInventoryDetailRequestDto : RequestDtoBase, IBranch - { - - - /// - /// 物料凭证号 - /// - public virtual string MaterialDocument { get; set; } - - - /// - /// 外部单号 - /// - public virtual string BillNumber { get; set; } - - /// - /// 记账日期 - /// - public virtual DateTime PostingDate { get; set; } - - - /// - /// 物料编号 - /// - public virtual string MaterialCode { get; set; } - - - - /// - /// 物料描述 - /// - public virtual string MaterialDesc { get; set; } - - - /// - /// 存储位置 - /// - public virtual string Storagelocation { get; set; } - - - /// - /// 收货数量 - /// - public virtual decimal ReceiveQty { get;set; } - - - /// - /// 发票数量 - /// - public virtual decimal InvoiceQty { get; set; } - - /// - /// 供应商编号 - /// - public virtual string SupplierCode { get; set; } - - /// - /// 供应商描述 - /// - public virtual string SupplierDesc { get; set; } - - - /// - /// 采购凭证 - /// - public virtual string PurchaseDocument { get; set; } - - - /// - /// 采购行项 - /// - public virtual string PurchaseLine { get; set; } - - - /// - /// 来源 - /// - public virtual string Source { get; set; } - - - - /// - /// 存储扩展字段 - /// - public virtual string Extend1 { get; set; } - public virtual Guid BranchId { get ; set ; } - - - public virtual Guid ParentId { get; set; } - public virtual Guid UserId { get; set; } - - public virtual int FileType { get; set; } - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs deleted file mode 100644 index 0bc4a681..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - public class EstimatedInventoryDetailUpdateDto : EstimatedInventoryDetailDtoBase - { - - - - - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs deleted file mode 100644 index 0edcb5b3..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.EstimatedInventories -{ - /// - /// EstimatedInventoryVersion - /// - public class EstimatedInventoryVersionDtoBase :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 EstimatedInventoryVersionDto : AuditedEntityDtoBase, 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 EstimatedInventoryVersionCreateDto : EstimatedInventoryVersionDtoBase - { } - public class EstimatedInventoryVersionUpdateDto : EstimatedInventoryVersionDtoBase - { } - public class EstimatedInventoryVersionRequestDto : 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 EstimatedInventoryVersionImportDto - { - - 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs deleted file mode 100644 index 3557e8fc..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs +++ /dev/null @@ -1,138 +0,0 @@ -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; -using Volo.Abp.Application.Services; - -using Win.Sfs.SettleAccount.EstimatedInventories; -using Win.Sfs.Shared.ApplicationBase; - -namespace Win.Sfs.SettleAccount.Entities.EstimatedInventories -{ - - - - public interface IEstimatedInventoryDetailAppService - { - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task EstimatedInventoryDetailUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory); - - - - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(Guid parentId, EstimatedInventoryDetailRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(EstimatedInventoryVersionRequestDto input); - - - - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - /// - /// 获取全部实体列表 - /// - /// 实体DTO列表 - - Task> GetAllAsync(Guid branchId); - - - - - - ///// - ///// 新增实体 - ///// - ///// 新增实体DTO - ///// 实体DTO - - - //Task CreateAsync(EstimatedInventoryDetailCreateDto input); - - - ///// - ///// 修改实体 - ///// - ///// ID - ///// 修改实体DTO - ///// 实体DTO - - //Task UpdateAsync(Guid id, EstimatedInventoryDetailUpdateDto input); - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - //Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - - - } - - - -} - - diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs deleted file mode 100644 index 72088bfd..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs +++ /dev/null @@ -1,356 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.EstimatedSums -{ - /// - /// 应付暂估汇总 - /// - public class EstimatedSumDtoBase : CreateOrUpdateEntityDtoBase - { - /// - /// 会计年度 - /// - /// 记账期间 - /// - - [Required(ErrorMessage = "{0}是必填项")] - - public virtual string Postingperiod { set; get; } - - /// - /// 物料代码（物料号） - /// - - [Required(ErrorMessage = "{0}是必填项")] - - public virtual string MaterialCode { set; get; } - /// - /// 物料描述 - /// - - [Required(ErrorMessage = "{0}是必填项")] - - public virtual string MaterialDesc { set; get; } - - /// - /// 数量 - /// - - - [Required(ErrorMessage = "{0}是必填项")] - - - public virtual Decimal Qty { set; get; } - - /// - /// 供应商 - /// - - [Required(ErrorMessage = "{0}是必填项")] - - public virtual string SupplierCode{set;get;} - - - - /// - ///采购订单号 - /// - public string PurchaseDocument { get; set; } - - - /// - /// 采购订单行号 - /// - public string PurchaseLine { get; set; } - - - /// - /// 供应商描述 - /// - //[ImporterHeader(Name = "值")] - //[Required(ErrorMessage = "{0}是必填项")] - //[MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - - public virtual string SupplierDesc { set; get; } - - } - public class EstimatedSumCreateDto : EstimatedSumDtoBase - { - public virtual Guid BranchId { get; set; } - } - public class EstimatedSumUpdateDto : EstimatedSumDtoBase - { - - - } - public class EstimatedSumRequestDto : RequestDtoBase, IBranch - { - - public virtual Guid UserId { get; set; } - - public virtual int FileType { get; set; } - - /// - /// 会计年度 - /// - /// 记账期间 - /// - public virtual string Postingperiod { set; get; } - - /// - /// 物料代码 - /// - public virtual string MaterialCode { set; get; } - /// - /// 物料描述 - /// - public virtual string MaterialDesc { set; get; } - - /// - ///采购订单号 - /// - public string PurchaseDocument { get; set; } - - - /// - /// 采购订单行号 - /// - public string PurchaseLine { get; set; } - - /// - /// 供应商编码 - /// - public virtual string SupplierCode { set; get; } - - /// - /// 供应商描述 - /// - public virtual string SupplierDesc { set; get; } - - - public virtual Guid ParentId { get; set; } - - public Guid BranchId { get ; set; } - } - public class EstimatedSumDto : AuditedEntityDtoBase, IBranch - { - - - public string Version { set; get; } - - /// - /// 会计年度 - /// - /// 记账期间 - /// - public virtual string Postingperiod { set; get; } - - /// - /// 物料代码 - /// - public virtual string MaterialCode { set; get; } - /// - /// 物料描述 - /// - public virtual string MaterialDesc { set; get; } - - /// - /// 数量 - /// - public virtual Decimal Qty { set; get; } - - /// - /// 供应商编码 - /// - public virtual string SupplierCode { set; get; } - - /// - /// 供应商描述 - /// - public virtual string SupplierDesc { set; get; } - - - - - /// - ///采购订单号 - /// - public string PurchaseDocument { get; set; } - - - /// - /// 采购订单行号 - /// - public string PurchaseLine { get; set; } - - - public Guid BranchId { get ; set ; } - } - public class EstimatedSumImportDto - { - /// - /// 会计年度 - /// - /// 记账期间 - /// - [ImporterHeader(Name = "记账期间")] - [Required(ErrorMessage = "{0}是必填项")] - - public virtual string Postingperiod { set; get; } - - /// - /// 物料代码（物料号） - /// - [ImporterHeader(Name = "物料号")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string MaterialCode { set; get; } - /// - /// 物料描述 - /// - [ImporterHeader(Name = "物料描述")] - [Required(ErrorMessage = "{0}是必填项")] - - public virtual string MaterialDesc { set; get; } - - /// - /// 数量 - /// - - [ImporterHeader(Name = "数量")] - [Required(ErrorMessage = "{0}是必填项")] - - - public virtual Decimal Qty { set; get; } - - /// - /// 供应商 - /// - [ImporterHeader(Name = "供应商")] - [Required(ErrorMessage = "{0}是必填项")] - [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] - public virtual string SupplierCode { set; get; } - - - - - - - - /// - ///采购订单号 - /// - [ImporterHeader(Name = "采购订单号")] - [Required(ErrorMessage = "{0}是必填项")] - public string PurchaseDocument { get; set; } - /// - /// 采购订单行号 - /// - [ImporterHeader(Name = "采购订单行号")] - [Required(ErrorMessage = "{0}是必填项")] - public string PurchaseLine { get; set; } - - - - } - - - - public class EstimatedSumExportDto - { - /// - /// 会计年度 - /// - /// 记账期间 - /// - [ExporterHeader(DisplayName = "记账期间")] - public virtual string Postingperiod { set; get; } - - - - - /// - ///采购订单号 - /// - [ExporterHeader(DisplayName = "采购订单号")] - public string PurchaseDocument { get; set; } - /// - /// 采购订单行号 - /// - [ExporterHeader(DisplayName = "采购订单行号")] - public string PurchaseLine { get; set; } - - - /// - /// 物料代码（物料号） - /// - [ExporterHeader(DisplayName = "物料号")] - - public virtual string MaterialCode { set; get; } - /// - /// 物料描述 - /// - [ExporterHeader(DisplayName = "物料描述")] - - - public virtual string MaterialDesc { set; get; } - - /// - /// 数量 - /// - - [ExporterHeader(DisplayName = "数量")] - public virtual Decimal Qty { set; get; } - - /// - /// 供应商 - /// - [ExporterHeader(DisplayName = "供应商")] - public virtual string SupplierCode { - - set; - get; - } - - /// - /// 供应商描述 - /// - [ExporterHeader(DisplayName = "供应商描述")] - public virtual string SupplierDesc { set; get; } - - - - - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs deleted file mode 100644 index 61d946e0..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs +++ /dev/null @@ -1,122 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.EstimatedSums -{ - /// - /// EstimatedSumVersion - /// - public class EstimatedSumVersionDtoBase :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 string Factory { private set; get; } - - - } - - - - public class EstimatedSumVersionDto : AuditedEntityDtoBase, 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 string Factory { private set; get; } - } - - public class EstimatedSumVersionCreateDto : EstimatedSumVersionDtoBase - { } - public class EstimatedSumVersionUpdateDto : EstimatedSumVersionDtoBase - { } - public class EstimatedSumVersionRequestDto : 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 string Factory { private set; get; } - } - - public class EstimatedSumVersionImportDto - { - - 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 string Factory { private set; get; } - - - } - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs deleted file mode 100644 index c82155c8..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs +++ /dev/null @@ -1,123 +0,0 @@ -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; -using Volo.Abp.Application.Services; - -using Win.Sfs.SettleAccount.EstimatedInventories; -using Win.Sfs.Shared.ApplicationBase; - -namespace Win.Sfs.SettleAccount.Entities.EstimatedSums -{ - - public interface IEstimatedSumAppService - { - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - Task EstimatedSumUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory); - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(Guid parentId, EstimatedSumRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(EstimatedSumVersionRequestDto input); - - - - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - ///// - ///// 获取全部实体列表 - ///// - ///// 实体DTO列表 - - //Task> GetAllAsync(Guid branchId); - - - - - - ///// - ///// 新增实体 - ///// - ///// 新增实体DTO - ///// 实体DTO - - - //Task CreateAsync(EstimatedSumCreateDto input); - - - ///// - ///// 修改实体 - ///// - ///// ID - ///// 修改实体DTO - ///// 实体DTO - - //Task UpdateAsync(Guid id, EstimatedSumUpdateDto input); - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - //Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs deleted file mode 100644 index 6038f52e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs +++ /dev/null @@ -1,273 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -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.HQExtend -{ - public class HQKBExtendDto - { - - - [ImporterHeader(Name = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ImporterHeader(Name = "采购申请单号")] - public string BillNum { get; set; } - [ImporterHeader(Name = "零件名称")] - public string MaterialDesc { get; set; } - [ImporterHeader(Name = "零件号")] - public string MaterialCode { get; set; } - [ImporterHeader(Name = "数量")] - public decimal Qty { get; set; } - [ImporterHeader(Name = "无税单价")] - public decimal Price { get; set; } - - [ImporterHeader(Name = "无税金额")] - public decimal Amt { get; set; } - [ImporterHeader(Name = "税率")] - public decimal Tax { get; set; } - [ImporterHeader(Name = "税额合计")] - public decimal TaxAmt { get; set; } - [ImporterHeader(Name = "价税合计")] - public decimal TotalAmt { get; set; } - [ImporterHeader(Name = "版本号", IsIgnore = false)] - public string Version { get; set; } - } - - - public class HQKBExtendRequestDto : RequestDtoBase, IBranch - { - [ImporterHeader(Name = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ImporterHeader(Name = "采购申请单号")] - public string BillNum { get; set; } - [ImporterHeader(Name = "零件名称")] - public string MaterialDesc { get; set; } - [ImporterHeader(Name = "零件号")] - public string MaterialCode { get; set; } - [ImporterHeader(Name = "数量")] - public decimal Qty { get; set; } - [ImporterHeader(Name = "无税单价")] - public decimal Price { get; set; } - - [ImporterHeader(Name = "无税金额")] - public decimal Amt { get; set; } - [ImporterHeader(Name = "税率")] - public decimal Tax { get; set; } - [ImporterHeader(Name = "税额合计")] - public decimal TaxAmt { get; set; } - [ImporterHeader(Name = "价税合计")] - public decimal TotalAmt { get; set; } - [ImporterHeader(Name = "版本号", IsIgnore = false)] - public string Version { get; set; } - public Guid BranchId { get; set; } - } - - public class HQKBExtendExportDto - { - [ExporterHeader(DisplayName = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ExporterHeader(DisplayName = "采购申请单号")] - public string BillNum { get; set; } - [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDesc { get; set; } - [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { get; set; } - [ExporterHeader(DisplayName = "数量")] - public decimal Qty { get; set; } - [ExporterHeader(DisplayName = "无税单价")] - public decimal Price { get; set; } - - [ExporterHeader(DisplayName = "无税金额")] - public decimal Amt { get; set; } - [ExporterHeader(DisplayName = "税率")] - public decimal Tax { get; set; } - [ExporterHeader(DisplayName = "税额合计")] - public decimal TaxAmt { get; set; } - [ExporterHeader(DisplayName = "价税合计")] - public decimal TotalAmt { get; set; } - [ExporterHeader(DisplayName = "版本号")] - public string Version { get; set; } - } - public class HQKBExtendVersionRequestDto : 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 HQKBExtendVersionDto - { - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { set; get; } - - - public string Factory { set; get; } - - } - - public class HQKBSettleExtendDto - { - - - [ImporterHeader(Name = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ImporterHeader(Name = "采购申请单号")] - public string BillNum { get; set; } - [ImporterHeader(Name = "零件名称")] - public string MaterialDesc { get; set; } - [ImporterHeader(Name = "零件号")] - public string MaterialCode { get; set; } - [ImporterHeader(Name = "数量")] - public decimal Qty { get; set; } - [ImporterHeader(Name = "无税单价")] - public decimal Price { get; set; } - - [ImporterHeader(Name = "无税金额")] - public decimal Amt { get; set; } - [ImporterHeader(Name = "税率")] - public decimal Tax { get; set; } - [ImporterHeader(Name = "税额合计")] - public decimal TaxAmt { get; set; } - [ImporterHeader(Name = "价税合计")] - public decimal TotalAmt { get; set; } - [ImporterHeader(Name = "版本号", IsIgnore = false)] - public string Version { get; set; } - } - - - public class HQKBSettleExtendRequestDto : RequestDtoBase, IBranch - { - [ImporterHeader(Name = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ImporterHeader(Name = "采购申请单号")] - public string BillNum { get; set; } - [ImporterHeader(Name = "零件名称")] - public string MaterialDesc { get; set; } - [ImporterHeader(Name = "零件号")] - public string MaterialCode { get; set; } - [ImporterHeader(Name = "数量")] - public decimal Qty { get; set; } - [ImporterHeader(Name = "无税单价")] - public decimal Price { get; set; } - - [ImporterHeader(Name = "无税金额")] - public decimal Amt { get; set; } - [ImporterHeader(Name = "税率")] - public decimal Tax { get; set; } - [ImporterHeader(Name = "税额合计")] - public decimal TaxAmt { get; set; } - [ImporterHeader(Name = "价税合计")] - public decimal TotalAmt { get; set; } - [ImporterHeader(Name = "版本号", IsIgnore = false)] - public string Version { get; set; } - public Guid BranchId { get; set; } - } - - public class HQKBSettleExtendExportDto - { - [ExporterHeader(DisplayName = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ExporterHeader(DisplayName = "采购申请单号")] - public string BillNum { get; set; } - [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDesc { get; set; } - [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { get; set; } - [ExporterHeader(DisplayName = "数量")] - public decimal Qty { get; set; } - [ExporterHeader(DisplayName = "无税单价")] - public decimal Price { get; set; } - - [ExporterHeader(DisplayName = "无税金额")] - public decimal Amt { get; set; } - [ExporterHeader(DisplayName = "税率")] - public decimal Tax { get; set; } - [ExporterHeader(DisplayName = "税额合计")] - public decimal TaxAmt { get; set; } - [ExporterHeader(DisplayName = "价税合计")] - public decimal TotalAmt { get; set; } - [ExporterHeader(DisplayName = "版本号")] - public string Version { get; set; } - } - public class HQKBSettleExtendVersionRequestDto : 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 HQKBSettleExtendVersionDto - { - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { set; get; } - - - public string Factory { set; get; } - - } - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs deleted file mode 100644 index 44655097..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.SettleAccount.Entities.VWScrapClaims; -using Win.Sfs.Shared; - -namespace Win.Sfs.SettleAccount.Entities.HQ_H -{ - public class HQ_H_PlatformCreateDto : HQ_H_PlatformDtoBase, IBranch - { - public virtual Guid BranchId { get; set; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs deleted file mode 100644 index 9a3edca6..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs +++ /dev/null @@ -1,93 +0,0 @@ -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.HQ_H -{ - - public class HQ_H_PlatformDto : AuditedEntityDtoBase - { - /// - ///工厂 - /// - public string Factory { get; set; } - /// - ///外部单号 - /// - public string ExternalKanbanNumber { get; set; } - /// - ///看板编号 - /// - public string KanbanNumber { get; set; } - /// - ///物料凭证号 - /// - public string MaterialVoucherNo { get; set; } - - /// - ///会计年度 - /// - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { set; get; } - /// - /// 版本号 - /// - public string Version { set; get; } - /// - /// 看板号 - /// - public string HQHKanBan { set; get; } - - - /// - /// 物料号 - /// - public string MaterialCode { get; set; } - - /// - /// 验收单日期 - /// - public DateTime AcceptanceDate { get; set; } - - /// - /// 供应商 - /// - public string Supplier { get; set; } - - /// - /// 存储地点 - /// - public string StorageLocation { get; set; } - - /// - /// 存储地点描述 - /// - public string StorageLocationDesc { get; set; } - - /// - ///验收单号 - /// - public string AcceptanceNo { get; set; } - - /// - /// 数量 - /// - public decimal Qty { set; get; } - - /// - /// 单价 - /// - public decimal Price { set; get; } - - /// - /// 金额 - /// - public decimal Amt { set; get; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs deleted file mode 100644 index 214442b8..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs +++ /dev/null @@ -1,93 +0,0 @@ -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.HQ_H -{ - public class HQ_H_PlatformDtoBase : CreateOrUpdateEntityDtoBase - { - /// - ///工厂 - /// - public string Factory { get; set; } - /// - ///外部单号 - /// - public string ExternalKanbanNumber { get; set; } - /// - ///看板编号 - /// - public string KanbanNumber { get; set; } - /// - ///物料凭证号 - /// - public string MaterialVoucherNo { get; set; } - - /// - ///会计年度 - /// - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { set; get; } - /// - /// 版本号 - /// - public string Version { set; get; } - /// - /// 类型：CP7报废和索赔两种 - /// - public string HQHKanBan { set; get; } - - - /// - /// 物料号 - /// - public string MaterialCode { get; set; } - - /// - /// 验收单日期 - /// - public DateTime AcceptanceDate { get; set; } - - /// - /// 供应商 - /// - public string Supplier { get; set; } - - /// - /// 存储地点描述 - /// - public string StorageLocation { get; set; } - - /// - /// 存储地点描述 - /// - public string StorageLocationDesc { get; set; } - - /// - ///验收单号 - /// - public string AcceptanceNo { get; set; } - - /// - /// 数量 - /// - public decimal Qty { set; get; } - - /// - /// 单价 - /// - public decimal Price { set; get; } - - /// - /// 金额 - /// - public decimal Amt { set; get; } - } - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs deleted file mode 100644 index 213804bd..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs +++ /dev/null @@ -1,109 +0,0 @@ -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.HQ_H -{ - public class HQ_H_PlatformExportDto - { - /// - ///工厂 - /// - [ExporterHeader(DisplayName = "工厂")] - public string Factory { get; set; } - /// - ///外部单号 - /// - [ExporterHeader(DisplayName = "外部单号")] - public string ExternalKanbanNumber { get; set; } - /// - ///看板编号 - /// - [ExporterHeader(DisplayName = "看板编号")] - public string KanbanNumber { get; set; } - /// - ///物料凭证号 - /// - [ExporterHeader(DisplayName = "物料凭证号")] - public string MaterialVoucherNo { get; set; } - - /// - ///会计年度 - /// - [ExporterHeader(DisplayName = "会计年度")] - public string Year { get; set; } - /// - /// 期间 - /// - [ExporterHeader(DisplayName = "期间")] - public string Period { set; get; } - /// - /// 版本号 - /// - [ExporterHeader(DisplayName = "版本号")] - public string Version { set; get; } - /// - /// 看板号 - /// - [ExporterHeader(DisplayName = "看板号")] - public string HQHKanBan { set; get; } - - - /// - /// 物料号 - /// - [ExporterHeader(DisplayName = "物料号")] - public string MaterialCode { get; set; } - - /// - /// 验收单日期 - /// - [ExporterHeader(DisplayName = "验收单日期")] - public DateTime AcceptanceDate { get; set; } - - /// - /// 供应商 - /// - [ExporterHeader(DisplayName = "供应商")] - public string Supplier { get; set; } - - /// - /// 存储地点 - /// - [ExporterHeader(DisplayName = "存储地点")] - public string StorageLocation { get; set; } - - /// - /// 存储地点描述 - /// - [ExporterHeader(DisplayName = "存储地点描述")] - public string StorageLocationDesc { get; set; } - - /// - ///验收单号 - /// - [ExporterHeader(DisplayName = "验收单号")] - public string AcceptanceNo { get; set; } - - /// - /// 数量 - /// - [ExporterHeader(DisplayName = "数量")] - public decimal Qty { set; get; } - - /// - /// 单价 - /// - [ExporterHeader(DisplayName = "单价")] - public decimal Price { set; get; } - - /// - /// 金额 - /// - [ExporterHeader(DisplayName = "金额")] - public decimal Amt { set; get; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs deleted file mode 100644 index e46caa69..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs +++ /dev/null @@ -1,109 +0,0 @@ -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.HQ_H -{ - public class HQ_H_PlatformImportDto - { - /// - ///工厂 - /// - [ImporterHeader(Name = "工厂")] - public string Factory { get; set; } - /// - ///外部单号 - /// - [ImporterHeader(Name = "外部单号")] - public string ExternalKanbanNumber { get; set; } - /// - ///看板编号 - /// - [ImporterHeader(Name = "看板编号")] - public string KanbanNumber { get; set; } - /// - ///物料凭证号 - /// - [ImporterHeader(Name = "物料凭证号")] - public string MaterialVoucherNo { get; set; } - - /// - ///会计年度 - /// - [ImporterHeader(Name = "会计年度")] - public string Year { get; set; } - /// - /// 期间 - /// - //[ImporterHeader(Name = "期间")] - //public string Period { set; get; } - /// - /// 版本号 - /// - //[ImporterHeader(Name = "版本号")] - //public string Version { set; get; } - /// - /// 看板号 - /// - [ImporterHeader(Name = "看板号")] - public string HQHKanBan { set; get; } - - - /// - /// 物料号 - /// - [ImporterHeader(Name = "物料号")] - public string MaterialCode { get; set; } - - /// - /// 验收单日期 - /// - [ImporterHeader(Name = "验收单日期")] - public DateTime AcceptanceDate { get; set; } - - /// - /// 供应商 - /// - [ImporterHeader(Name = "供应商")] - public string Supplier { get; set; } - - /// - /// 存储地点 - /// - [ImporterHeader(Name = "存储地点")] - public string StorageLocation { get; set; } - - /// - /// 存储地点描述 - /// - [ImporterHeader(Name = "存储地点描述")] - public string StorageLocationDesc { get; set; } - - /// - ///验收单号 - /// - [ImporterHeader(Name = "验收单号")] - public string AcceptanceNo { get; set; } - - /// - /// 数量 - /// - [ImporterHeader(Name = "数量")] - public decimal Qty { set; get; } - - /// - /// 单价 - /// - [ImporterHeader(Name = "单价")] - public decimal Price { set; get; } - - /// - /// 金额 - /// - [ImporterHeader(Name = "金额")] - public decimal Amt { set; get; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs deleted file mode 100644 index 5d0ee41c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs +++ /dev/null @@ -1,101 +0,0 @@ -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.HQ_H -{ - public class HQ_H_PlatformRequestDto : RequestDtoBase - { - - /// - ///工厂 - /// - public string Factory { get; set; } - /// - ///外部单号 - /// - public string ExternalKanbanNumber { get; set; } - /// - ///看板编号 - /// - public string KanbanNumber { get; set; } - /// - ///物料凭证号 - /// - public string MaterialVoucherNo { get; set; } - - /// - ///会计年度 - /// - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { set; get; } - /// - /// 版本号 - /// - public string Version { set; get; } - /// - /// 看板号 - /// - public string HQHKanBan { set; get; } - - - /// - /// 物料号 - /// - public string MaterialCode { get; set; } - - /// - /// 验收单日期 - /// - public DateTime AcceptanceDate { get; set; } - - /// - /// 供应商 - /// - public string Supplier { get; set; } - - /// - /// 存储地点 - /// - public string StorageLocation { get; set; } - - /// - ///验收单号 - /// - public string AcceptanceNo { get; set; } - - /// - /// 数量 - /// - public decimal Qty { set; get; } - - /// - /// 单价 - /// - public decimal Price { set; get; } - - /// - /// 金额 - /// - public decimal Amt { set; get; } - - /// - /// 存储地点描述 - /// - public string StorageLocationDesc { 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs deleted file mode 100644 index 371dba32..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs +++ /dev/null @@ -1,100 +0,0 @@ -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.HQ_H -{ - /// - /// SettleAccountVersion - /// - public class HQ_H_PlatformVersionDtoBase : 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 HQ_H_PlatformVersionDto : 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 HQ_H_PlatformVersionCreateDto : HQ_H_PlatformVersionDtoBase - { } - public class HQ_H_PlatformVersionUpdateDto : HQ_H_PlatformVersionDtoBase - { } - public class HQ_H_PlatformVersionRequestDto : 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 HQ_H_PlatformVersionImportDto - { - - 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs deleted file mode 100644 index f2f940d6..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs +++ /dev/null @@ -1,91 +0,0 @@ -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.HQ_H -{ - public interface IHQ_H_PlatformAppService - { - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task HQ_H_PlatformUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, - string year, string period, string version, string customerCode); - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(HQ_H_PlatformRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(HQ_H_PlatformVersionRequestDto input); - - - Task ExportAsync(HQ_H_PlatformRequestDto input); - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs index ae7e6e21..0b2e5d47 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.Inventories; using Win.Sfs.Shared.ApplicationBase; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs index 6cc80e46..e4c2b1c9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.Shared.ApplicationBase; namespace Win.Sfs.SettleAccount.ItemInvoicePrices { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs deleted file mode 100644 index 7a19368f..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs +++ /dev/null @@ -1,137 +0,0 @@ -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; -using Volo.Abp.Application.Services; - -using Win.Sfs.SettleAccount.EstimatedInventories; -using Win.Sfs.Shared.ApplicationBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - - public interface ISecondaryAdjustmentAppService - - - { - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task SecondaryAdjustmentUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory); - - - - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(Guid parentId, SecondaryAdjustmentRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(SecondaryAdjustmentVersionRequestDto input); - - - - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - /// - /// 获取全部实体列表 - /// - /// 实体DTO列表 - - ///Task> GetAllAsync(Guid branchId); - - - - - - ///// - ///// 新增实体 - ///// - ///// 新增实体DTO - ///// 实体DTO - - - //Task CreateAsync(SecondaryAdjustmentCreateDto input); - - - ///// - ///// 修改实体 - ///// - ///// ID - ///// 修改实体DTO - ///// 实体DTO - - //Task UpdateAsync(Guid id, SecondaryAdjustmentUpdateDto input); - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - //Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - - - } - - - -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs deleted file mode 100644 index b622ad2b..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs +++ /dev/null @@ -1,137 +0,0 @@ -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; -using Volo.Abp.Application.Services; - -using Win.Sfs.SettleAccount.EstimatedInventories; -using Win.Sfs.Shared.ApplicationBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - - public interface ISecondaryDiscountAppService - - - { - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task SecondaryDiscountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory); - - - - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(Guid parentId, SecondaryDiscountRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(SecondaryDiscountVersionRequestDto input); - - - - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - /// - /// 获取全部实体列表 - /// - /// 实体DTO列表 - - ///Task> GetAllAsync(Guid branchId); - - - - - - ///// - ///// 新增实体 - ///// - ///// 新增实体DTO - ///// 实体DTO - - - //Task CreateAsync(SecondaryDiscountCreateDto input); - - - ///// - ///// 修改实体 - ///// - ///// ID - ///// 修改实体DTO - ///// 实体DTO - - //Task UpdateAsync(Guid id, SecondaryDiscountUpdateDto input); - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - //Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - - - } - - - -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs deleted file mode 100644 index 1e271152..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs +++ /dev/null @@ -1,135 +0,0 @@ -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; -using Volo.Abp.Application.Services; - -using Win.Sfs.SettleAccount.EstimatedInventories; -using Win.Sfs.Shared.ApplicationBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - public interface ISecondaryPriceRatioAppService - - - { - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task SecondaryPriceRatioUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory); - - - - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(Guid parentId, SecondaryPriceRatioRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(SecondaryPriceRatioVersionRequestDto input); - - - - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - /// - ///// 获取全部实体列表 - ///// - ///// 实体DTO列表 - - //Task> GetAllAsync(Guid branchId); - - - - - - ///// - ///// 新增实体 - ///// - ///// 新增实体DTO - ///// 实体DTO - - - //Task CreateAsync(SecondaryPriceRatioCreateDto input); - - - ///// - ///// 修改实体 - ///// - ///// ID - ///// 修改实体DTO - ///// 实体DTO - - //Task UpdateAsync(Guid id, SecondaryPriceRatioUpdateDto input); - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - //Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - - - } - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs deleted file mode 100644 index 45c9059c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs +++ /dev/null @@ -1,360 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - - /// - /// SecondaryAdjustment - /// - public class SecondaryAdjustmentDtoBase : CreateOrUpdateEntityDtoBase - { - - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - - /// - /// 价格或零件号变动情况 - /// - - //[Display(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - - public string Remark { set; get; } - - - } - - - - public class SecondaryAdjustmentDto : AuditedEntityDtoBase - { - - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - /// - /// 价格或零件号变动情况 - /// - - //[Display(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - } - public class SecondaryAdjustmentCreateDto : SecondaryAdjustmentDtoBase - { } - public class SecondaryAdjustmentUpdateDto : SecondaryAdjustmentDtoBase - { } - public class SecondaryAdjustmentRequestDto : RequestDtoBase, IBranch - { - - - public virtual Guid UserId { get; set; } - - public virtual int FileType { get; set; } - - - - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - - - public Guid ParentId { set; get; } - public Guid BranchId { get ; set ; } - } - - - public class SecondaryAdjustmentImportDto - { - - /// - /// 客户总成物料号 - /// - [ImporterHeader(Name = "客户总成物料号")] - [Required(ErrorMessage = "{0}是必填项")] - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - [ImporterHeader(Name = "客户组件物料号")] - [Required(ErrorMessage = "{0}是必填项")] - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - - - [ImporterHeader(Name = "供应商代码")] - [Required(ErrorMessage = "{0}是必填项")] - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - [ImporterHeader(Name = "回款零件数量")] - [Required(ErrorMessage = "{0}是必填项")] - public decimal Qty { set; get; } - - - - - - - /// - /// 价格或零件号变动情况 - /// - - [ImporterHeader(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - [ImporterHeader(Name = "二配采购员")] - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - - - - - - - } - public class SecondaryAdjustmentExportDto - { - - [ExporterHeader(DisplayName = "期间")] - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - [ExporterHeader(DisplayName = "客户总成物料号")] - - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - [ExporterHeader(DisplayName = "客户组件物料号")] - - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - - - [ExporterHeader(DisplayName = "供应商代码")] - - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - [ExporterHeader(DisplayName = "零件数量（回款）")] - - public decimal Qty { set; get; } - - - - - - - /// - /// 价格或零件号变动情况 - /// - - [ExporterHeader(DisplayName = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - [ExporterHeader(DisplayName = "二配采购员")] - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - [ExporterHeader(DisplayName = "备注")] - //[Display(Name = "二配采购员")] - public string Remark { get; set; } - - - - - - } - - - -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs deleted file mode 100644 index c56b393c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - - /// - /// SecondaryAdjustmentVersion - /// - public class SecondaryAdjustmentVersionDtoBase : 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 string Factory { private set; get; } - - - } - - - - public class SecondaryAdjustmentVersionDto : AuditedEntityDtoBase, 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 string Factory { private set; get; } - } - - public class SecondaryAdjustmentVersionCreateDto : SecondaryAdjustmentVersionDtoBase - { } - public class SecondaryAdjustmentVersionUpdateDto : SecondaryAdjustmentVersionDtoBase - { } - public class SecondaryAdjustmentVersionRequestDto : 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 string Factory { private set; get; } - } - - public class SecondaryAdjustmentVersionImportDto - { - - 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 string Factory { private set; get; } - - - } - -} - diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs deleted file mode 100644 index 784ba67a..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs +++ /dev/null @@ -1,319 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - - /// - /// SecondaryDiscount - /// - public class SecondaryDiscountDtoBase : CreateOrUpdateEntityDtoBase - { - - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - - /// - /// 价格或零件号变动情况 - /// - - //[Display(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - - public string Remark { set; get; } - - - } - - - - public class SecondaryDiscountDto : AuditedEntityDtoBase - { - - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - /// - /// 价格或零件号变动情况 - /// - - //[Display(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - } - public class SecondaryDiscountCreateDto : SecondaryDiscountDtoBase - { } - public class SecondaryDiscountUpdateDto : SecondaryDiscountDtoBase - { } - public class SecondaryDiscountRequestDto : RequestDtoBase, IBranch - { - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - - - public Guid ParentId { set; get; } - public Guid BranchId { get ; set ; } - } - - - public class SecondaryDiscountImportDto - { - - - /// - /// 供应商代码 - /// - - - [ImporterHeader(Name = "供应商代码")] - [Required(ErrorMessage = "{0}是必填项")] - public string SupplierCode { set; get; } - - /// - /// 价格或零件号变动情况 - /// - - [ImporterHeader(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - [ImporterHeader(Name = "二配采购员")] - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - - - /// - /// 金额（不含税） - /// - [ImporterHeader(Name = "不含税金额")] - - public decimal Amt { set; get; } - - - - - - - } - - - public class SecondaryDiscountExportDto - { - - /// - /// 供应商代码 - /// - [ExporterHeader(DisplayName ="供应商代码")] - [Required(ErrorMessage = "{0}是必填项")] - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - [ExporterHeader(DisplayName ="回款零件数量")] - [Required(ErrorMessage = "{0}是必填项")] - public decimal Qty { set; get; } - - - /// - /// 价格或零件号变动情况 - /// - [ExporterHeader(DisplayName ="价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - [ExporterHeader(DisplayName ="二配采购员")] - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - - /// - /// 金额（不含税） - /// - [ExporterHeader(DisplayName ="不含税金额")] - - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - [ExporterHeader(DisplayName ="含税金额")] - public decimal Total { set; get; } - - - - - } - - - - - -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs deleted file mode 100644 index 9c40563e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - - /// - /// SecondaryDiscountVersion - /// - public class SecondaryDiscountVersionDtoBase : 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 string Factory { private set; get; } - - - } - - - - public class SecondaryDiscountVersionDto : AuditedEntityDtoBase, 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 string Factory { private set; get; } - } - - public class SecondaryDiscountVersionCreateDto : SecondaryDiscountVersionDtoBase - { } - public class SecondaryDiscountVersionUpdateDto : SecondaryDiscountVersionDtoBase - { } - public class SecondaryDiscountVersionRequestDto : 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 string Factory { private set; get; } - } - - public class SecondaryDiscountVersionImportDto - { - - 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 string Factory { private set; get; } - - - } - -} - diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs deleted file mode 100644 index 067728ba..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs +++ /dev/null @@ -1,388 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching -{ - - /// - /// SecondaryPriceRatio - /// - public class SecondaryPriceRatioDtoBase : CreateOrUpdateEntityDtoBase - { - - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - - public string Version { set; get; } - - - - - /// - /// 客户代码 - /// - public string CustomerCode { set; get; } - - - - /// - /// 客户总成物料号 - /// - public string CustomItemCode { set; get; } - - /// - /// 客户物料号结算价格 - /// - public decimal CustomItemPrice { set; get; } - - - - /// - /// 客户组件物料号 - /// - public string CustomSubItemCode { get; set; } - - - /// - /// 客户物料号结算价格 - /// - public decimal CustomSubItemPrice { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { get; set; } - /// - /// 供应商描述 - /// - public string SupplierDesc { get; set; } - - /// - /// 供货比例 - /// - public string SupplyProportion { set; get; } - - /// - /// 比例供货价格 - /// - public decimal SupplyProportionPrice { get; set; } - - - public Guid ParentId { set; get; } - - } - - - - public class SecondaryPriceRatioDto : AuditedEntityDtoBase, IBranch - { - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - - public string Version { set; get; } - - - - - /// - /// 客户代码 - /// - public string CustomerCode { set; get; } - - - - /// - /// 客户总成物料号 - /// - public string CustomItemCode { set; get; } - - /// - /// 客户物料号结算价格 - /// - public decimal CustomItemPrice { set; get; } - - - - /// - /// 客户组件物料号 - /// - public string CustomSubItemCode { get; set; } - - - /// - /// 客户物料号结算价格 - /// - public decimal CustomSubItemPrice { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { get; set; } - /// - /// 供应商描述 - /// - public string SupplierDesc { get; set; } - - /// - /// 供货比例 - /// - public string SupplyProportion { set; get; } - - /// - /// 比例供货价格 - /// - public decimal SupplyProportionPrice { get; set; } - - - public Guid ParentId { set; get; } - public Guid BranchId { get ; set; } - } - - public class SecondaryPriceRatioCreateDto : SecondaryPriceRatioDtoBase - { } - public class SecondaryPriceRatioUpdateDto : SecondaryPriceRatioDtoBase - { } - public class SecondaryPriceRatioRequestDto : RequestDtoBase, IBranch - { - - - public virtual Guid UserId { get; set; } - - public virtual int FileType { get; set; } - - public string Version { set; get; } - - /// - /// 客户代码 - /// - public string CustomerCode { set; get; } - - /// - /// 客户总成物料号 - /// - public string CustomItemCode { set; get; } - - /// - /// 客户物料号结算价格 - /// - public decimal CustomItemPrice { set; get; } - - - - /// - /// 客户组件物料号 - /// - public string CustomSubItemCode { get; set; } - - - /// - /// 客户物料号结算价格 - /// - public decimal CustomSubItemPrice { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { get; set; } - /// - /// 供应商描述 - /// - public string SupplierDesc { get; set; } - - /// - /// 供货比例 - /// - public string SupplyProportion { set; get; } - - /// - /// 比例供货价格 - /// - public decimal SupplyProportionPrice { get; set; } - - - public Guid ParentId { set; get; } - public Guid BranchId { get ; set ; } - } - - public class SecondaryPriceRatioImportDto - { - - - - - - - - /// - /// 客户代码 - /// - [ImporterHeader(Name = "客户代码")] - [Required(ErrorMessage = "{0}是必填项")] - - public string CustomerCode { set; get; } - - - - /// - /// 客户物料号 - /// - [ImporterHeader(Name = "客户总成物料号")] - [Required(ErrorMessage = "{0}是必填项")] - public string CustomItemCode { set; get; } - - /// - /// 客户物料号结算价格 - /// - [ImporterHeader(Name = "客户物料号结算价格")] - [Required(ErrorMessage = "{0}是必填项")] - public decimal CustomItemPrice { set; get; } - - - - /// - /// 客户组件物料号 - /// - [ImporterHeader(Name = "客户组件")] - [Required(ErrorMessage = "{0}是必填项")] - public string CustomSubItemCode { get; set; } - - - /// - /// 客户物料号结算价格 - /// - [ImporterHeader(Name = "客户组件结算价格")] - [Required(ErrorMessage = "{0}是必填项")] - public decimal CustomSubItemPrice { set; get; } - - - /// - /// 供应商代码 - /// - - [ImporterHeader(Name = "供应商代码")] - [Required(ErrorMessage = "{0}是必填项")] - public string SupplierCode { get; set; } - /// - /// 供应商描述 - /// - [ImporterHeader(Name = "供应商描述")] - - public string SupplierDesc { get; set; } - - /// - /// 供货比例 - /// - [ImporterHeader(Name = "供货比例")] - [Required(ErrorMessage = "{0}是必填项")] - public string SupplyProportion { set; get; } - - - - - - - - - } - public class SecondaryPriceRatioExportDto - { - - - [ExporterHeader(DisplayName = "期间")] - public string Version { set; get; } - - /// - /// 客户代码 - /// - [ExporterHeader(DisplayName ="客户代码")] - - - public string CustomerCode { set; get; } - - - - /// - /// 客户物料号 - /// - [ExporterHeader(DisplayName ="客户总成物料号")] - - public string CustomItemCode { set; get; } - - /// - /// 客户物料号结算价格 - /// - [ExporterHeader(DisplayName ="客户物料号结算价格")] - - public decimal CustomItemPrice { set; get; } - - - - /// - /// 客户组件物料号 - /// - [ExporterHeader(DisplayName ="客户组件")] - - public string CustomSubItemCode { get; set; } - - - /// - /// 客户物料号结算价格 - /// - [ExporterHeader(DisplayName ="客户组件结算价格")] - - public decimal CustomSubItemPrice { set; get; } - - - /// - /// 供应商代码 - /// - - [ExporterHeader(DisplayName ="供应商代码")] - - public string SupplierCode { get; set; } - /// - /// 供应商描述 - /// - [ExporterHeader(DisplayName ="供应商描述")] - - public string SupplierDesc { get; set; } - - /// - /// 供货比例 - /// - [ExporterHeader(DisplayName ="供货比例")] - - public string SupplyProportion { set; get; } - - - - /// - /// 比例供货价格 - /// - [ExporterHeader(DisplayName = "供货比例价格")] - public decimal SupplyProportionPrice { get; set; } - - - - - } - - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs deleted file mode 100644 index 6ff42fc6..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs +++ /dev/null @@ -1,126 +0,0 @@ -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.SecondaryMatching -{ - - - - /// - /// SecondaryPriceRatioVersion - /// - public class SecondaryPriceRatioVersionDtoBase : 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 string Factory { private set; get; } - - - } - - - - public class SecondaryPriceRatioVersionDto : AuditedEntityDtoBase - { - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { set; get; } - - /// - /// 工厂 - /// - public string Factory { set; get; } - } - - public class SecondaryPriceRatioVersionCreateDto : SecondaryPriceRatioVersionDtoBase - { } - public class SecondaryPriceRatioVersionUpdateDto : SecondaryPriceRatioVersionDtoBase - { } - public class SecondaryPriceRatioVersionRequestDto : RequestDtoBase, 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 string Factory { private set; get; } - } - - public class SecondaryPriceRatioVersionImportDto - { - - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { set; get; } - - - /// - /// 工厂 - /// - public string Factory { set; get; } - - - } - - - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs deleted file mode 100644 index 3dce6130..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs +++ /dev/null @@ -1,110 +0,0 @@ -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; -using Volo.Abp.Application.Services; -using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices; -using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences; -using Win.Sfs.SettleAccount.EstimatedInventories; -using Win.Sfs.Shared.ApplicationBase; -namespace Win.Sfs.SettleAccount.SettlementCrossReferences -{ - public interface ISettlementCrossReferenceAppService - { - - /// - /// 빦 - /// - /// ϴļ(ǰѾֻϴһ) - /// - - Task SettlementCrossReferenceUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory); - - - - - /// - /// IDȡΨһʵ - /// - /// - /// ʵȫ - /// - /// ID - /// ʵDTO - - - /// - /// ɸѡȡʵб - /// - /// - /// :ɸѡб,,,ҳ - /// - /// - /// ʵDTOб - - Task> GetListAsync(SettlementCrossReferenceRequestDto input); - - - /// - /// ȡʵ - /// - /// ʵ - - Task GetTotalCountAsync(Guid branchId); - - - /// - /// ȡȫʵб - /// - /// ʵDTOб - - //Task> GetAllAsync(Guid branchId); - - - - - - /// - /// ʵ - /// - /// ʵDTO - /// ʵDTO - - - Task CreateAsync(SettlementCrossReferenceCreateDto input); - - - /// - /// ޸ʵ - /// - /// ID - /// ޸ʵDTO - /// ʵDTO - - Task UpdateAsync(Guid id, SettlementCrossReferenceUpdateDto input); - - - - - ///// - ///// ɾʵ - ///// - ///// ID - ///// - - //Task DeleteAsync(Guid id); - - - /// - /// IDsɾʵб - /// - /// IDs - /// Ƿִгɹ - - Task DeleteListAsync(List ids); - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs deleted file mode 100644 index 1a1ed435..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs +++ /dev/null @@ -1,85 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - - /// - /// 导入ImportSettlementCrossReferenceDto - /// IsLabelingError：是否标注数据错误 - /// - [ImportProject(Name = SettleAccountModuleName.SettlementCrossReference)] - [ExcelImporter(IsLabelingError = true, MaxCount = int.MaxValue)] - public class ImportSettlementCrossReferenceDto - { - - - - /// - /// 车型 - /// - [ImporterHeader(Name = "车型")] - [Display(Name = "车型")] - public string Model { set; get; } - - - /// - /// 零件类型 - /// - [ImporterHeader(Name = "零件类型")] - [Display(Name = "零件类型")] - public string PartType { get; set; } - - /// - /// 总成结算号 - /// - [ImporterHeader(Name = "总成结算号")] - [Display(Name = "总成结算号")] - public string SettlementMaterialCode { get; set; } - - /// - /// BOM清单零件号 - /// - [ImporterHeader(Name = "BOM清单零件号")] - [Display(Name = "BOM清单零件号")] - public string BomMaterialCode { get; set; } - - ///// - ///// 零件名称 - ///// - //[Display(Name = "零件名称")] - //public string MaterialDesc { get; set; } - - /// - /// 供应商代码 - /// - [ImporterHeader(Name = "供应商代码")] - [Display(Name = "供应商代码")] - public string SupplierCode { set; get; } - ///// - ///// 供应商名称 - ///// - //[Display(Name = "供应商名称")] - //public string SupplierDesc { set; get; } - /// - /// 采购员 - /// - [ImporterHeader(Name = "采购员")] - [Display(Name = "采购员")] - public string Buyer { set; get; } - - - - } - - - -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs deleted file mode 100644 index f1845d74..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs +++ /dev/null @@ -1,75 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - public class SettlementCrossReferenceCreateDto : CreateOrUpdateEntityDtoBase - { - - /// - /// 期间 - /// - [Display(Name = "期间")] - public string Period { set; get; } - /// - /// 车型 - /// - [Display(Name = "车型")] - public string Model { set; get; } - /// - /// 工厂 - /// - [Display(Name = "工厂")] - public string Factory { set; get; } - - - /// - /// 零件类型 - /// - [Display(Name = "零件类型")] - public string PartType { get; set; } - - /// - /// 总成结算号 - /// - [Display(Name = "总成结算号")] - public string SettlementMaterialCode { get; set; } - - /// - /// BOM清单零件号 - /// - [Display(Name = "BOM清单零件号")] - public string BomMaterialCode { get; set; } - - /// - /// 零件名称 - /// - [Display(Name = "零件名称")] - public string MaterialDesc { get; set; } - - /// - /// 供应商代码 - /// - [Display(Name = "供应商代码")] - public string SupplierCode { set; get; } - /// - /// 供应商名称 - /// - [Display(Name = "供应商名称")] - public string SupplierDesc { set; get; } - /// - /// 采购员 - /// - [Display(Name = "采购员")] - public string Buyer { set; get; } - - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs deleted file mode 100644 index 8f537f84..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs +++ /dev/null @@ -1,75 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - public class SettlementCrossReferenceDto : AuditedEntityDtoBase, IBranch - { - - /// - /// 期间 - /// - [Display(Name = "期间")] - public string Period { set; get; } - /// - /// 车型 - /// - [Display(Name = "车型")] - public string Model { set; get; } - /// - /// 工厂 - /// - [Display(Name = "工厂")] - public string Factory { set; get; } - - - /// - /// 零件类型 - /// - [Display(Name = "零件类型")] - public string PartType { get; set; } - - /// - /// 总成结算号 - /// - [Display(Name = "总成结算号")] - public string SettlementMaterialCode { get; set; } - - /// - /// BOM清单零件号 - /// - [Display(Name = "BOM清单零件号")] - public string BomMaterialCode { get; set; } - - /// - /// 零件名称 - /// - [Display(Name = "零件名称")] - public string MaterialDesc { get; set; } - - /// - /// 供应商代码 - /// - [Display(Name = "供应商代码")] - public string SupplierCode { set; get; } - /// - /// 供应商名称 - /// - [Display(Name = "供应商名称")] - public string SupplierDesc { set; get; } - /// - /// 采购员 - /// - [Display(Name = "采购员")] - public string Buyer { set; get; } - public string Version { get; set; } - public string CustomerCode { get; set; } - public Guid BranchId { get ; set; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs deleted file mode 100644 index 78f353ee..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs +++ /dev/null @@ -1,73 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using Magicodes.ExporterAndImporter.Core; -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - public class SettlementCrossReferenceExportDto - { - - /// - /// 期间 - /// - [ExporterHeader(DisplayName = "期间")] - public string Period { set; get; } - /// - /// 车型 - /// - [ExporterHeader(DisplayName = "车型")] - public string Model { set; get; } - /// - /// 工厂 - /// - [ExporterHeader(DisplayName = "工厂")] - public string Factory { set; get; } - - - /// - /// 零件类型 - /// - [ExporterHeader(DisplayName = "零件类型")] - public string PartType { get; set; } - - /// - /// 总成结算号 - /// - [ExporterHeader(DisplayName = "总成结算号")] - public string SettlementMaterialCode { get; set; } - - /// - /// BOM清单零件号 - /// - [ExporterHeader(DisplayName = "BOM清单零件号")] - public string BomMaterialCode { get; set; } - - /// - /// 零件名称 - /// - [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDesc { get; set; } - - /// - /// 供应商代码 - /// - [ExporterHeader(DisplayName = "供应商代码")] - public string SupplierCode { set; get; } - /// - /// 供应商名称 - /// - [ExporterHeader(DisplayName = "供应商名称")] - public string SupplierDesc { set; get; } - /// - /// 采购员 - /// - [ExporterHeader(DisplayName = "采购员")] - public string Buyer { set; get; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs deleted file mode 100644 index 93f9ed24..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs +++ /dev/null @@ -1,85 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - public class SettlementCrossReferenceRequestDto : RequestDtoBase, IBranch - { - - /// - /// 版本 - /// - [Display(Name = "版本")] - public string Version { set; get; } - /// - /// 期间 - /// - [Display(Name = "期间")] - public string Period { set; get; } - /// - /// 车型 - /// - [Display(Name = "车型")] - public string Model { set; get; } - /// - /// 工厂 - /// - [Display(Name = "工厂")] - public string Factory { set; get; } - - - /// - /// 零件类型 - /// - [Display(Name = "零件类型")] - public string PartType { get; set; } - - /// - /// 总成结算号 - /// - [Display(Name = "总成结算号")] - public string SettlementMaterialCode { get; set; } - - /// - /// BOM清单零件号 - /// - [Display(Name = "BOM清单零件号")] - public string BomMaterialCode { get; set; } - - /// - /// 零件名称 - /// - [Display(Name = "零件名称")] - public string MaterialDesc { get; set; } - - /// - /// 供应商代码 - /// - [Display(Name = "供应商代码")] - public string SupplierCode { set; get; } - /// - /// 供应商名称 - /// - [Display(Name = "供应商名称")] - public string SupplierDesc { set; get; } - /// - /// 采购员 - /// - [Display(Name = "采购员")] - public string Buyer { 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; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs deleted file mode 100644 index 9481e293..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs +++ /dev/null @@ -1,75 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - public class SettlementCrossReferenceUpdateDto : CreateOrUpdateEntityDtoBase - { - - /// - /// 期间 - /// - [Display(Name = "期间")] - public string Period { set; get; } - /// - /// 车型 - /// - [Display(Name = "车型")] - public string Model { set; get; } - /// - /// 工厂 - /// - [Display(Name = "工厂")] - public string Factory { set; get; } - - - /// - /// 零件类型 - /// - [Display(Name = "零件类型")] - public string PartType { get; set; } - - /// - /// 总成结算号 - /// - [Display(Name = "总成结算号")] - public string SettlementMaterialCode { get; set; } - - /// - /// BOM清单零件号 - /// - [Display(Name = "BOM清单零件号")] - public string BomMaterialCode { get; set; } - - /// - /// 零件名称 - /// - [Display(Name = "零件名称")] - public string MaterialDesc { get; set; } - - /// - /// 供应商代码 - /// - [Display(Name = "供应商代码")] - public string SupplierCode { set; get; } - /// - /// 供应商名称 - /// - [Display(Name = "供应商名称")] - public string SupplierDesc { set; get; } - /// - /// 采购员 - /// - [Display(Name = "采购员")] - public string Buyer { set; get; } - - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs deleted file mode 100644 index c88460bc..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs +++ /dev/null @@ -1,28 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - public class SettlementCrossReferenceVersionDto : RequestDtoBase, IBranch - { - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; private set; } - - - public Guid BranchId { get; set; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs deleted file mode 100644 index cf7fc3b9..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs +++ /dev/null @@ -1,28 +0,0 @@ -// 闻荫智慧工厂管理套件 -// Copyright (c) 闻荫科技 www.ccwin-in.com - -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared; -using Win.Sfs.Shared.Constant; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences -{ - public class SettlementCrossReferenceVersionRequestDto : RequestDtoBase, IBranch - { - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; private set; } - - - public Guid BranchId { get; set; } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs index d45ad757..cd9e3e49 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs @@ -10,7 +10,6 @@ using Volo.Abp.Application.Services; using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion; using Win.Sfs.SettleAccount.Entities.SettlementParts; using Win.Sfs.SettleAccount.Entities.SettlementPartss; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.Inventories; using Win.Sfs.Shared.ApplicationBase; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs index d5347226..2a26f8c3 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.Inventories; using Win.Sfs.Shared.ApplicationBase; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs deleted file mode 100644 index f029f95c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs +++ /dev/null @@ -1,131 +0,0 @@ -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; -using Volo.Abp.Application.Services; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; - -using Win.Sfs.Shared.ApplicationBase; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - public interface IUnSettleAccountAppService - - { - - - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task UnSettleAccountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory); - - - - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(Guid parentId, UnSettleAccountRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(UnSettleAccountVersionRequestDto input); - - - - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - ///// - ///// 获取全部实体列表 - ///// - ///// 实体DTO列表 - - //Task> GetAllAsync(Guid branchId); - - - - - - ///// - ///// 新增实体 - ///// - ///// 新增实体DTO - ///// 实体DTO - - - //Task CreateAsync(SettleAccountCreateDto input); - - - ///// - ///// 修改实体 - ///// - ///// ID - ///// 修改实体DTO - ///// 实体DTO - - //Task UpdateAsync(Guid id, SettleAccountUpdateDto input); - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - //Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs deleted file mode 100644 index fc35422e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - public class UnSettleAccountCreateDto : SettleAccountDtoBase, IBranch - { - public virtual Guid BranchId { get ; set ; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs deleted file mode 100644 index 9223ea28..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - public class UnSettleAccountDto: AuditedEntityDtoBase, IBranch - { - - - - /// - /// 期间 - /// - public string Period { set; get; } - - - - /// - /// 年份 - /// - public string SettleYear { set; get; } - - /// - /// 年份 - /// - public virtual string Year { set; get; } - /// - /// KENEN号 - /// - public virtual string KENNCode { set; get; } - /// - /// 底盘号 - /// - public virtual string ChassisNumber { set; get; } - /// - /// 车型 - /// - public virtual string Model { set; get; } - /// - /// CP5A日期 - /// - public virtual DateTime CP5A { set; get; } - /// - /// CP7 - /// - public virtual DateTime CP7 { set; get; } - - /// - /// 零件号 - /// - public virtual string MaterialCode { get; set; } - /// - /// 数量 - /// - public virtual decimal Qty { get; set; } - /// - /// 结算标识 - /// - - public virtual string SettlementID { get; set; } - - /// - /// 结算供应商 - /// - public virtual string SettlementSupplier { get; set; } - - - public virtual string State { get; set; } - - public virtual Guid BranchId { get ; set ; } - - - public virtual string Version { get; set; } - - public string UnsettledReason { get; set; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs deleted file mode 100644 index 4ee60537..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - public class UnSettleAccountDtoBase: CreateOrUpdateEntityDtoBase - { - - /// - /// 期间 - /// - public string Period { set; get; } - - - - /// - /// 年份 - /// - public string SettleYear { set; get; } - /// - /// 年份 - /// - public virtual string Year { set; get; } - /// - /// KENEN号 - /// - public virtual string KENNCode { set; get; } - /// - /// 底盘号 - /// - public virtual string ChassisNumber { set; get; } - /// - /// 车型 - /// - public virtual string Model { set; get; } - /// - /// CP5A日期 - /// - public virtual DateTime CP5A { set; get; } - /// - /// CP7 - /// - public virtual DateTime CP7 { set; get; } - - /// - /// 零件号 - /// - public virtual string MaterialCode { get; set; } - /// - /// 数量 - /// - public virtual decimal Qty { get; set; } - /// - /// 结算标识 - /// - - public virtual string SettlementID { get; set; } - - /// - /// 结算供应商 - /// - public virtual string SettlementSupplier { get; set; } - - public string UnsettledReason { get; set; } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs deleted file mode 100644 index 37e4eb0f..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs +++ /dev/null @@ -1,88 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -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.SettleAccounts -{ - public class UnSettleAccountExportDto - { - - [ExporterHeader(DisplayName = "版本")] - public string Version { set; get; } - - - /// - /// 期间 - /// - - - //[ExporterHeader(DisplayName = "期间")] - //public string Period { set; get; } - - ///// - ///// 年份 - ///// - //[ExporterHeader(DisplayName = "年份")] - //public string SettleYear { set; get; } - - /// - /// KENEN号 - /// - [ExporterHeader(DisplayName = "KENN号")] - public virtual string KENNCode { set; get; } - /// - /// 底盘号 - /// - [ExporterHeader(DisplayName = "底盘号")] - - public virtual string ChassisNumber { set; get; } - /// - /// 车型 - /// - [ExporterHeader(DisplayName = "车型")] - - public virtual string Model { set; get; } - /// - /// CP5A日期 - /// - [ExporterHeader(DisplayName = "CP5日期")] - public virtual DateTime CP5A { set; get; } - /// - /// CP7 - /// - [ExporterHeader(DisplayName = "CP7日期")] - public virtual DateTime CP7 { set; get; } - - /// - /// 零件号 - /// - [ExporterHeader(DisplayName = "零件号")] - - public virtual string MaterialCode { get; set; } - /// - /// 数量 - /// - [ExporterHeader(DisplayName = "数量")] - public virtual decimal Qty { get; set; } - /// - /// 结算标识 - /// - [ExporterHeader(DisplayName = "结算标识")] - public virtual string SettlementID { get; set; } - - /// - /// 结算供应商 - /// - [ExporterHeader(DisplayName = "结算供应商")] - - public virtual string SettlementSupplier { get; set; } - - - [ExporterHeader(DisplayName = "未结算原因")] - public string UnsettledReason { get; set; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs deleted file mode 100644 index 1b2eb0be..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs +++ /dev/null @@ -1,82 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -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.SettleAccounts -{ - public class UnSettleAccountImportDto - { - - /// - /// 期间 - /// - // public string Period { set; get; } - - /// - /// 年份 - /// - [ImporterHeader(Name = "年份")] - public string SettleYear { set; get; } - /// - /// 年份 - /// - //public virtual string Year { set; get; } - /// - /// KENEN号 - /// - [ImporterHeader(Name = "KENN号")] - public virtual string KENNCode { set; get; } - /// - /// 底盘号 - /// - [ImporterHeader(Name = "底盘号")] - public virtual string ChassisNumber { set; get; } - /// - /// 车型 - /// - [ImporterHeader(Name = "车型")] - public virtual string Model { set; get; } - /// - /// CP5A日期 - /// - [ImporterHeader(Name = "CP5A日期")] - public virtual DateTime CP5A { set; get; } - /// - /// CP7 - /// - [ImporterHeader(Name = "CP7日期")] - public virtual DateTime? CP7 { set; get; } - - /// - /// 零件号 - /// - [ImporterHeader(Name = "零件号",FixAllSpace =true)] - public virtual string MaterialCode { get; set; } - /// - /// 数量 - /// - [ImporterHeader(Name = "数量")] - public virtual decimal Qty { get; set; } - /// - /// 结算标识 - /// - [ImporterHeader(Name = "结算标识")] - public virtual string SettlementID { get; set; } - - /// - /// 结算供应商 - /// - [ImporterHeader(Name = "结算供应商")] - public virtual string SettlementSupplier { get; set; } - - /// - /// 未结算原因 - /// - [ImporterHeader(Name = "未结算原因")] - public string UnsettledReason { get; set; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs deleted file mode 100644 index e59dc781..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - public class UnSettleAccountRequestDto: RequestDtoBase, IBranch - { - - /// - /// 期间 - /// - public string Period { set; get; } - - - - /// - /// 年份 - /// - public string SettleYear { set; get; } - /// - /// 年份 - /// - public virtual string Year { set; get; } - /// - /// KENEN号 - /// - public virtual string KENNCode { set; get; } - /// - /// 底盘号 - /// - public virtual string ChassisNumber { set; get; } - /// - /// 车型 - /// - public virtual string Model { set; get; } - /// - /// CP5A日期 - /// - public virtual DateTime CP5A { set; get; } - /// - /// CP7 - /// - public virtual DateTime CP7 { set; get; } - - /// - /// 零件号 - /// - public virtual string MaterialCode { get; set; } - /// - /// 数量 - /// - public virtual decimal Qty { get; set; } - /// - /// 结算标识 - /// - - public virtual string SettlementID { get; set; } - - /// - /// 结算供应商 - /// - public virtual string SettlementSupplier { get; set; } - - public string UnsettledReason { 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; } - - public virtual string Version { get; set; } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs deleted file mode 100644 index 9af35ee9..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -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.SettleAccounts -{ - public class UnSettleAccountUpdateDto: SettleAccountDtoBase - { - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs deleted file mode 100644 index 296e0a64..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.DtoBase; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccountVersion -{ - /// - /// SettleAccountVersion - /// - public class UnSettleAccountVersionDtoBase : 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 UnSettleAccountVersionDto : 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 UnSettleAccountVersionCreateDto : SettleAccountVersionDtoBase - { } - public class UnSettleAccountVersionUpdateDto : SettleAccountVersionDtoBase - { } - public class UnSettleAccountVersionRequestDto : 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 UnSettleAccountVersionImportDto - { - - 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs deleted file mode 100644 index 28a18ca3..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs +++ /dev/null @@ -1,94 +0,0 @@ -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.VWScrapClaims -{ - /// - /// 报废与索赔 - /// - public interface IScrapClaimsAppService - { - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task ScrapClaimsUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, - string year, string period, string version, string customerCode); - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync(ScrapClaimsRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(ScrapClaimsVersionRequestDto input); - - - Task ExportAsync(ScrapClaimsRequestDto input); - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs deleted file mode 100644 index 45ff634c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -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.VWScrapClaims -{ - - public class ScrapClaimsCreateDto : ScrapClaimsDtoBase, IBranch - { - public virtual Guid BranchId { get; set; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs deleted file mode 100644 index 363c8e11..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs +++ /dev/null @@ -1,59 +0,0 @@ -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.VWScrapClaims -{ - /// - /// CP7报废和索赔 - /// - public class ScrapClaimsDto : AuditedEntityDtoBase - { - /// - /// 期间 - /// - public string Period { set; get; } - - /// - /// 版本 - /// - public virtual string Version { get; set; } - - /// - /// 类型：CP7报废和索赔两种 - /// - public string Type { set; get; } - - - /// - /// 零件号 - /// - public string MaterialCode { get; set; } - - /// - /// 零件名称 - /// - public string MaterialDesc { get; set; } - - - - /// - /// 数量 - /// - public decimal Qty { set; get; } - - /// - /// 金额 - /// - public decimal Amt { set; get; } - - - /// - /// 备注 - /// - public string Extend { set; get; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs deleted file mode 100644 index ff0db803..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs +++ /dev/null @@ -1,58 +0,0 @@ -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.VWScrapClaims -{ - public class ScrapClaimsDtoBase : CreateOrUpdateEntityDtoBase - { - - /// - /// 期间 - /// - public string Period { set; get; } - - /// - /// 版本 - /// - public virtual string Version { get; set; } - - /// - /// 类型：CP7报废和索赔两种 - /// - public string Type { set; get; } - - - /// - /// 零件号 - /// - public string MaterialCode { get; set; } - - /// - /// 零件名称 - /// - public string MaterialDesc { get; set; } - - - - /// - /// 数量 - /// - public decimal Qty { set; get; } - - /// - /// 金额 - /// - public decimal Amt { set; get; } - - - /// - /// 备注 - /// - public string Extend { set; get; } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs deleted file mode 100644 index bae9167a..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs +++ /dev/null @@ -1,57 +0,0 @@ -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.VWScrapClaims -{ - public class ScrapClaimsExportDto - { - - /// - /// 期间 - /// - [ExporterHeader(DisplayName = "期间")] - public string Period { set; get; } - - /// - /// 版本 - /// - [ExporterHeader(DisplayName = "版本")] - public virtual string Version { get; set; } - - - /// - /// 类型 - /// - [ExporterHeader(DisplayName = "类型")] - public virtual string Type { set; get; } - - /// - /// 零件号 - /// - [ExporterHeader(DisplayName = "零件号")] - public virtual string MaterialCode { set; get; } - /// - /// 零件类型 - /// - [ExporterHeader(DisplayName = "零件名称")] - public virtual string MaterialDesc { set; get; } - - - /// - /// 数量 - /// - [ExporterHeader(DisplayName = "数量")] - public virtual decimal Qty { get; set; } - /// - /// 金额 - /// - [ExporterHeader(DisplayName = "金额")] - public virtual decimal Amt { get; set; } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs deleted file mode 100644 index 4d2344d7..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs +++ /dev/null @@ -1,55 +0,0 @@ -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.VWScrapClaims -{ - public class ScrapClaimsImportDto - { - ///// - ///// 期间 - ///// - //[ImporterHeader(Name = "期间")] - //public string Period { set; get; } - - ///// - ///// 版本 - ///// - //[ImporterHeader(Name = "版本")] - //public virtual string Version { get; set; } - - /// - ///类型 - /// - [ImporterHeader(Name = "类型")] - public string Type { set; get; } - - /// - /// 零件号 - /// - [ImporterHeader(Name = "零件号", FixAllSpace = true)] - public virtual string MaterialCode { set; get; } - /// - /// 零件类型 - /// - [ImporterHeader(Name = "零件名称")] - public virtual string MaterialDesc { set; get; } - - /// - /// 数量 - /// - [ImporterHeader(Name = "数量")] - public virtual decimal Qty { get; set; } - /// - /// 金额 - /// - [ImporterHeader(Name = "金额")] - public virtual decimal Amt { get; set; } - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs deleted file mode 100644 index 651b846f..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs +++ /dev/null @@ -1,64 +0,0 @@ -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.VWScrapClaims -{ - public class ScrapClaimsRequestDto : RequestDtoBase - { - - /// - /// 期间 - /// - public string Period { set; get; } - - /// - /// 版本 - /// - public virtual string Version { get; set; } - - /// - /// 类型：CP7报废和索赔两种 - /// - public string Type { set; get; } - - - /// - /// 零件号 - /// - public string MaterialCode { get; set; } - - /// - /// 零件名称 - /// - public string MaterialDesc { get; set; } - - - - /// - /// 数量 - /// - public decimal Qty { set; get; } - - /// - /// 金额 - /// - public decimal Amt { set; get; } - - /// - /// 备注 - /// - 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs deleted file mode 100644 index af418849..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs +++ /dev/null @@ -1,100 +0,0 @@ -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.VWScrapClaims -{ - /// - /// SettleAccountVersion - /// - public class ScrapClaimsVersionDtoBase : 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 ScrapClaimsVersionDto : 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 ScrapClaimsVersionCreateDto : ScrapClaimsVersionDtoBase - { } - public class ScrapClaimsVersionUpdateDto : ScrapClaimsVersionDtoBase - { } - public class ScrapClaimsVersionRequestDto : 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 ScrapClaimsVersionImportDto - { - - 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs deleted file mode 100644 index f3fec313..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs +++ /dev/null @@ -1,94 +0,0 @@ -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.VWSparePart -{ - /// - /// /大众备件导入功能 - /// - public interface ISparePartAppService - { - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - - Task SparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, - string year, string period, string version, string customerCode); - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - - Task GetAsync(Guid id); - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetListAsync( SparePartRequestDto input); - - - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - - Task> GetVersionListAsync(SparePartVersionRequestDto input); - - - Task ExportAsync(SparePartRequestDto input); - - /// - /// 获取实体总数 - /// - /// 实体总数 - - Task GetTotalCountAsync(Guid branchId); - - - - - - ///// - ///// 删除实体 - ///// - ///// ID - ///// 无 - - Task DeleteAsync(Guid id); - - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - - Task DeleteListAsync(List ids); - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs deleted file mode 100644 index d28ae13e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -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.VWSparePart -{ - - public class SparePartCreateDto : SparePartDtoBase, IBranch - { - public virtual Guid BranchId { get; set; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs deleted file mode 100644 index ac77efef..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs +++ /dev/null @@ -1,125 +0,0 @@ -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.VWSparePart -{ - /// - /// 大众备件结算明细DTO - /// - public class SparePartDto : 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs deleted file mode 100644 index 7a7f283d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs +++ /dev/null @@ -1,124 +0,0 @@ -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.VWSparePart -{ - public class SparePartDtoBase : 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs deleted file mode 100644 index 33c5ab3b..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs +++ /dev/null @@ -1,143 +0,0 @@ -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.VWSparePart -{ - public class SparePartExportDto - { - - /// - /// 期间 - /// - [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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs deleted file mode 100644 index 2ce7e0c2..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs +++ /dev/null @@ -1,129 +0,0 @@ -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.VWSparePart -{ - public class SparePartImportDto - { - - /// - /// 行号 - /// - [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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs deleted file mode 100644 index 7ceb6ac2..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs +++ /dev/null @@ -1,129 +0,0 @@ -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.VWSparePart -{ - public class SparePartRequestDto : 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs deleted file mode 100644 index 733cbed0..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs +++ /dev/null @@ -1,100 +0,0 @@ -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.VWSparePart -{ - /// - /// SettleAccountVersion - /// - public class SparePartVersionDtoBase : 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 SparePartVersionDto : 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 SparePartVersionCreateDto : SparePartVersionDtoBase - { } - public class SparePartVersionUpdateDto : SparePartVersionDtoBase - { } - public class SparePartVersionRequestDto : 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 SparePartVersionImportDto - { - - 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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs deleted file mode 100644 index 35b74168..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs +++ /dev/null @@ -1,96 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs deleted file mode 100644 index 0824c763..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs deleted file mode 100644 index a3aba35b..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs +++ /dev/null @@ -1,113 +0,0 @@ -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; } - - - /// - /// WMS交货单 - /// - public string WMSDeliveryNote { set; get; } - - /// - /// WMS实际发货日期 - /// - public string WMSActualGoodsDate { set; get; } - - - /// - /// WMS交货数量 - /// - public decimal WMSDeliveryQty { set; get; } - - /// - /// WMS发货状态 - /// - public string WMSDeliverGoodsState { set; get; } - - /// - /// 看板结算状态 - /// - public string WMSKanBanState { set; get; } - - /// - /// 结算状态 - /// - public virtual string State { get; set; } - - /// - /// 出库单号 - /// - public string DeliveryOrderNo { set; get; } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs deleted file mode 100644 index def36a38..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs +++ /dev/null @@ -1,85 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs deleted file mode 100644 index 21e830f3..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs +++ /dev/null @@ -1,92 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs deleted file mode 100644 index 3bdd6acf..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs +++ /dev/null @@ -1,93 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs deleted file mode 100644 index 751e15f3..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs +++ /dev/null @@ -1,93 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs deleted file mode 100644 index 2634a16e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs +++ /dev/null @@ -1,100 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs deleted file mode 100644 index cbc4329f..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs deleted file mode 100644 index 56ee2272..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs +++ /dev/null @@ -1,91 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs deleted file mode 100644 index db4379be..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs deleted file mode 100644 index d775ee59..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs +++ /dev/null @@ -1,137 +0,0 @@ -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; } - - /// - /// WMS交货单 - /// - public string WMSDeliveryNote { set; get; } - - /// - /// WMS发货状态 - /// - public string WMSDeliverGoodsState { set; get; } - - /// - /// 看板结算状态 - /// - public string WMSSparePartState { set; get; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs deleted file mode 100644 index ff78ca70..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs +++ /dev/null @@ -1,124 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs deleted file mode 100644 index 888e2dd8..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs +++ /dev/null @@ -1,143 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs deleted file mode 100644 index cd8af4fc..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs +++ /dev/null @@ -1,129 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs deleted file mode 100644 index bc090dda..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs +++ /dev/null @@ -1,129 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs deleted file mode 100644 index b2d78b86..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs +++ /dev/null @@ -1,100 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs index a33b8cef..74fdd97a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs @@ -27,12 +27,10 @@ using Win.Sfs.SettleAccount.CommonManagers; using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.Boms; using Win.Sfs.SettleAccount.Entities.Errors; -using Win.Sfs.SettleAccount.Entities.EstimatedInventories; using Win.Sfs.SettleAccount.Entities.ImportMap; using Win.Sfs.SettleAccount.Entities.Prices; using Win.Sfs.SettleAccount.Entities.TaskJobs; using Win.Sfs.SettleAccount.Errors; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.ExcelImporter; using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.SettleAccount.Reports; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs deleted file mode 100644 index 3548daed..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs +++ /dev/null @@ -1,347 +0,0 @@ - - - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Caching.Distributed; -using Shouldly; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Volo.Abp.ObjectMapping; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.ERPShipping; -using Win.Sfs.SettleAccount.Entities.ERPShpping; -using Win.Sfs.SettleAccount.Entities.HQExtend; -using Win.Sfs.SettleAccount.Entities.ImportMap; -using Win.Sfs.SettleAccount.Entities.Materials; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.Shared.CacheBase; -using Win.Sfs.Shared.Filter; -using Win.Utils; - -namespace Win.Sfs.SettleAccount.HQKBExtends -{ - - /// - /// Ӧ÷ - /// - [Authorize(SettleAccountPermissions.Boms.Default)] - //[AllowAnonymous] - [Route("api/settleaccount/ErpShipping")] - public class HQKBExtendAppService : SettleAccountApplicationBase - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IObjectMapper _objectMapper; - - private readonly IExcelImportAppService _excelImportService; - - - private readonly ISettleAccountBranchEfCoreRepository _repository; - - - private readonly ISettleAccountBranchEfCoreRepository _materialRepository; - - private readonly ISettleAccountBranchEfCoreRepository _importColumnMapRepository; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - /// - /// - /// - /// UID - /// Զmap - /// ִӿ - /// - public HQKBExtendAppService(IGuidGenerator guidGenerator, - IObjectMapper objectMapper, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ISettleAccountBranchEfCoreRepository repository, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository materialRepository, - ISettleAccountBranchEfCoreRepository importColumnMapRepository, - IDistributedCache cache - ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager) - { - _guidGenerator = guidGenerator; - _objectMapper = objectMapper; - _repository = repository; - _excelImportService = excelImportService; - _versionRepository = versionRepository; - _materialRepository = materialRepository; - _importColumnMapRepository = importColumnMapRepository; - } - - #region 뵼 - - - - - - /// - /// 빦 - /// - /// ϴļ(ǰѾֻϴһ) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - - - public async Task HQKBExtendUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory) - { - - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - var _versionQuery = _versionRepository.Where(p => p.Version == version ); - await _versionQuery.BatchDeleteAsync(); - var _query = _repository.Where(p => p.Version == version ); - await _query.BatchDeleteAsync(); - //var checkList = new List(); - //var _matList =await _materialRepository.GetAllAsync(GuidGenerator.Create()); - // var _group = entityList.GroupBy(x => new { x.ParentItemCode, x.ChildItemCode, x.Version }).Select(p => new { Count = p.Count(),ParentItmeCode=p.Key.ParentItemCode, ChildItemCode=p.Key.ChildItemCode }); - //foreach (var itm in _group) - //{ - // if (itm.Count > 1) - // { - // checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ܵ븸{0},ӱ{1}ظ", itm.ParentItmeCode, itm.ChildItemCode), string.Empty)); - // } - //} - //var _id = GuidGenerator.Create(); - //var _HQKBExtendList = new List(); - //_HQKBExtendList.Add(new HQKBExtendVersion(_id, branchId, year, period, version, customerCode,factory)); - //foreach (var itm in entityList) - //{ - // if (!_matList.Any(p => p.MaterialCode == itm.ParentItemCode)) - // { - // checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, itm.ParentItemCode, string.Empty, string.Format("ݲϺ{0}", itm.ParentItemCode), string.Empty)); - // continue; - // } - // itm.SetValue(GuidGenerator.Create(),branchId,year,period,version,_id,factory); - //} - //if (checkList.Count > 0) - //{ - // return await ExportErrorReportAsync(checkList); - //} - await _repository.GetDbContext().BulkInsertAsync(entityList); - - await _versionRepository.GetDbContext().BulkInsertAsync(new List { new HQKBExtendVersion(Guid.NewGuid(), branchId, year, period, version, customerCode, factory) }); - - //st.Stop(); - return ApplicationConsts.SuccessStr; - } - /// - /// ļ - /// - /// - /// - [HttpPost] - [Route("Export")] - - virtual public async Task ExportAsync(HQKBExtendRequestDto input) - { - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - //ϰ汾ȫ - if (!string.IsNullOrEmpty(input.Version )) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() }); - } - //else - //{ - // return new PagedResultDto(0, new List()); - //} - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - var dtoDetails = ObjectMapper.Map, List>(entities); - string _fileName = string.Empty; - // - - byte[] result = null; - - - - _fileName = string.Format("ERP_{0}.xlsx", Guid.NewGuid().ToString("N")); - result = await _excel.ExportAsByteArray(dtoDetails); - - - result.ShouldNotBeNull(); - - //浼ļɶ - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - #endregion - - /// - /// IDȡΨһʵ - /// - /// - /// ʵȫ - /// - /// ID - /// ʵDTO - [HttpGet] - [Route("{id}")] - - virtual public async Task GetAsync(Guid id) - { - var result = await _repository.GetAsync(id); - var dto = _objectMapper.Map(result); - return dto; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(HQKBExtendRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - private async Task GetCountAsync(HQKBExtendVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - /// - /// ȡʵ - /// - /// ʵ - [HttpGet] - [Route("count")] - - virtual public async Task GetTotalCountAsync(Guid branchId) - { - return await _repository.GetCountAsync(branchId); - } - - - - /// - /// ɾʵ - /// - /// 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) - { - //foreach (var id in ids) - //{ - // var entity = await GetFromCacheAsync(id); - - //} - - return await _repository.DeleteListAsync(ids); - } - - - ///// - - /// - /// ɸѡȡʵб - /// - /// - /// :ɸѡб,,,ҳ - /// - /// - /// ʵDTOб - [HttpPost] - [Route("list")] - - public async Task> GetListAsync(Guid parentId, HQKBExtendRequestDto input) - { - if (!string.IsNullOrEmpty(input.Version) ) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0,new List()); - } - 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б - [HttpPost] - [Route("listVersion")] - - public async Task> GetVersionListAsync(HQKBExtendVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = _objectMapper.Map, List>(entities); - //foreach (var itm in dtos) - //{ - // itm.Version = itm.Version + string.Format("({0})", itm.Factory); - //} - return new PagedResultDto(totalCount, dtos); - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs deleted file mode 100644 index 9b3f16f6..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs +++ /dev/null @@ -1,346 +0,0 @@ - - - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Caching.Distributed; -using Shouldly; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Volo.Abp.ObjectMapping; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.ERPShipping; -using Win.Sfs.SettleAccount.Entities.ERPShpping; -using Win.Sfs.SettleAccount.Entities.HQExtend; -using Win.Sfs.SettleAccount.Entities.ImportMap; -using Win.Sfs.SettleAccount.Entities.Materials; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.Shared.CacheBase; -using Win.Sfs.Shared.Filter; -using Win.Utils; - -namespace Win.Sfs.SettleAccount.HQKBExtends -{ - - /// - /// Ӧ÷ - /// - [Authorize(SettleAccountPermissions.Boms.Default)] - //[AllowAnonymous] - [Route("api/settleaccount/ErpShipping")] - public class HQKBSettleExtendAppService : SettleAccountApplicationBase - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IObjectMapper _objectMapper; - - private readonly IExcelImportAppService _excelImportService; - - - private readonly ISettleAccountBranchEfCoreRepository _repository; - - - private readonly ISettleAccountBranchEfCoreRepository _materialRepository; - - private readonly ISettleAccountBranchEfCoreRepository _importColumnMapRepository; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - /// - /// - /// - /// UID - /// Զmap - /// ִӿ - /// - public HQKBSettleExtendAppService(IGuidGenerator guidGenerator, - IObjectMapper objectMapper, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ISettleAccountBranchEfCoreRepository repository, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository materialRepository, - ISettleAccountBranchEfCoreRepository importColumnMapRepository, - IDistributedCache cache - ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager) - { - _guidGenerator = guidGenerator; - _objectMapper = objectMapper; - _repository = repository; - _excelImportService = excelImportService; - _versionRepository = versionRepository; - _materialRepository = materialRepository; - _importColumnMapRepository = importColumnMapRepository; - } - - #region 뵼 - - - - - /// - /// 빦 - /// - /// ϴļ(ǰѾֻϴһ) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - - - public async Task HQKBSettleExtendUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory) - { - - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - var _versionQuery = _versionRepository.Where(p => p.Version == version ); - await _versionQuery.BatchDeleteAsync(); - var _query = _repository.Where(p => p.Version == version ); - await _query.BatchDeleteAsync(); - //var checkList = new List(); - //var _matList =await _materialRepository.GetAllAsync(GuidGenerator.Create()); - // var _group = entityList.GroupBy(x => new { x.ParentItemCode, x.ChildItemCode, x.Version }).Select(p => new { Count = p.Count(),ParentItmeCode=p.Key.ParentItemCode, ChildItemCode=p.Key.ChildItemCode }); - //foreach (var itm in _group) - //{ - // if (itm.Count > 1) - // { - // checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ܵ븸{0},ӱ{1}ظ", itm.ParentItmeCode, itm.ChildItemCode), string.Empty)); - // } - //} - //var _id = GuidGenerator.Create(); - //var _HQKBSettleExtendList = new List(); - //_HQKBSettleExtendList.Add(new HQKBSettleExtendVersion(_id, branchId, year, period, version, customerCode,factory)); - //foreach (var itm in entityList) - //{ - // if (!_matList.Any(p => p.MaterialCode == itm.ParentItemCode)) - // { - // checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, itm.ParentItemCode, string.Empty, string.Format("ݲϺ{0}", itm.ParentItemCode), string.Empty)); - // continue; - // } - // itm.SetValue(GuidGenerator.Create(),branchId,year,period,version,_id,factory); - //} - //if (checkList.Count > 0) - //{ - // return await ExportErrorReportAsync(checkList); - //} - await _repository.GetDbContext().BulkInsertAsync(entityList); - - await _versionRepository.GetDbContext().BulkInsertAsync(new List { new HQKBSettleExtendVersion(Guid.NewGuid(), branchId, year, period, version, customerCode, factory) }); - - //st.Stop(); - return ApplicationConsts.SuccessStr; - } - /// - /// ļ - /// - /// - /// - [HttpPost] - [Route("Export")] - - virtual public async Task ExportAsync(HQKBSettleExtendRequestDto input) - { - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - //ϰ汾ȫ - if (!string.IsNullOrEmpty(input.Version )) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() }); - } - //else - //{ - // return new PagedResultDto(0, new List()); - //} - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - var dtoDetails = ObjectMapper.Map, List>(entities); - string _fileName = string.Empty; - // - - byte[] result = null; - - - - _fileName = string.Format("ERP_{0}.xlsx", Guid.NewGuid().ToString("N")); - result = await _excel.ExportAsByteArray(dtoDetails); - - - result.ShouldNotBeNull(); - - //浼ļɶ - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - #endregion - - /// - /// IDȡΨһʵ - /// - /// - /// ʵȫ - /// - /// ID - /// ʵDTO - [HttpGet] - [Route("{id}")] - - virtual public async Task GetAsync(Guid id) - { - var result = await _repository.GetAsync(id); - var dto = _objectMapper.Map(result); - return dto; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(HQKBSettleExtendRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - private async Task GetCountAsync(HQKBSettleExtendVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - /// - /// ȡʵ - /// - /// ʵ - [HttpGet] - [Route("count")] - - virtual public async Task GetTotalCountAsync(Guid branchId) - { - return await _repository.GetCountAsync(branchId); - } - - - - /// - /// ɾʵ - /// - /// 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) - { - //foreach (var id in ids) - //{ - // var entity = await GetFromCacheAsync(id); - - //} - - return await _repository.DeleteListAsync(ids); - } - - - ///// - - /// - /// ɸѡȡʵб - /// - /// - /// :ɸѡб,,,ҳ - /// - /// - /// ʵDTOб - [HttpPost] - [Route("list")] - - public async Task> GetListAsync(Guid parentId, HQKBSettleExtendRequestDto input) - { - if (!string.IsNullOrEmpty(input.Version) ) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0,new List()); - } - 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б - [HttpPost] - [Route("listVersion")] - - public async Task> GetVersionListAsync(HQKBSettleExtendVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = _objectMapper.Map, List>(entities); - //foreach (var itm in dtos) - //{ - // itm.Version = itm.Version + string.Format("({0})", itm.Factory); - //} - return new PagedResultDto(totalCount, dtos); - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs deleted file mode 100644 index 76a5e094..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs +++ /dev/null @@ -1,344 +0,0 @@ -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.Filter; - -namespace Win.Sfs.SettleAccount.Entities.HQ_H -{ - /// - /// 红旗H平台导入 - /// - [Authorize(SettleAccountPermissions.HQ_HPlatform.Default)] - //[AllowAnonymous] - [Route("api/settleaccount/HQHPlatform")] - public class HQ_H_PlatformAppService : SettleAccountApplicationBase, IHQ_H_PlatformAppService - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IExcelImportAppService _excelImportService; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _repository; - - - private readonly ErpPartDapperRepository _erpdapperRepository; - /// - /// 构建方法 - /// - /// 构建UID - /// 仓储接口 - /// 缓存 - public HQ_H_PlatformAppService(IGuidGenerator guidGenerator, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository repository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ErpPartDapperRepository erpdapperRepository, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _versionRepository = versionRepository; - _guidGenerator = guidGenerator; - _excelImportService = excelImportService; - _repository = repository; - _erpdapperRepository = erpdapperRepository; - } - - /// - /// 统一导入红旗平台数据，包括H、M、F平台 - /// - /// - /// - /// - /// - /// - /// - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [UnitOfWork(false)] - [Authorize(SettleAccountPermissions.HQ_HPlatform.Create)] - public async Task HQ_H_PlatformUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode) - { - ExportImporter _exportImporter = new ExportImporter(); - var checkList = new List(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - - if (result == null || result.Count == 0) - { - throw new BusinessException("导入模板数据不能为空！"); - } - - var entityList = ObjectMapper.Map, List>(result); - - //和物料主数据中SAP物料号检验是否存在 - foreach (var itm in entityList) - { - if (!_erpdapperRepository.GetMaterialList().Any(p => p.CustomerPartCode == itm.MaterialCode)) - { - checkList.Add(new ErrorExportDto(version, "红旗结算导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty)); - } - } - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - //删除版本 - var _versionQuery = _versionRepository.Where(p => p.Version == version); - await _versionQuery.BatchDeleteAsync(); - //删除明细 - var _query = _repository.Where(p => p.Version == version); - await _query.BatchDeleteAsync(); - - var _id = GuidGenerator.Create(); - var _bomList = new List(); - _bomList.Add(new HQ_H_PlatformVersion(_id, branchId, year, period, version, customerCode)); - foreach (var itm in entityList) - { - if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品")) - { - //赋值上主键ID - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "BJ");//备品库没有看板号，需要特殊标识一下BJ,已经和客户确认 - } - else - { - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version); - } - } - - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - - 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; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(HQ_H_PlatformRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - private async Task GetCountAsync(HQ_H_PlatformVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - /// - /// 导出文件 - /// - /// - /// - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(HQ_H_PlatformRequestDto input) - { - - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("红旗工厂结算明细_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("红旗工厂结算明细_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - [HttpPost] - [Route("list")] - virtual public async Task> GetListAsync(HQ_H_PlatformRequestDto input) - { - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0, new List()); - } - 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); - } - - - /// - /// 获取实体总数 - /// - /// 实体总数 - [HttpGet] - [Route("count")] - [Authorize(SettleAccountPermissions.SettleAccounts.Default)] - 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); - - - var dtos = ObjectMapper.Map, List>(entities); - - - return new ListResultDto(dtos); - } - - - - /// - /// 删除实体 - /// - /// ID - /// 无 - [HttpDelete] - [Route("{id}")] - /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteAsync(Guid id) - { - await _repository.DeleteAsync(id); - } - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - [HttpPost] - [Route("delete")] - // [Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteListAsync(List ids) - { - foreach (var id in ids) - { - var entity = await GetFromCacheAsync(id); - //await Cache.DeleteAsync(id.ToString()); - } - - return await _repository.DeleteListAsync(ids); - } - - - - /// - /// 版本列表查询 - /// - /// - /// - [HttpPost] - [Route("listversion")] - public async Task> GetVersionListAsync(HQ_H_PlatformVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - - return new PagedResultDto(totalCount, dtos); - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs index 9f6825b7..9aa8e504 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs @@ -26,11 +26,9 @@ 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.EstimatedInventories; using Win.Sfs.SettleAccount.Entities.ImportMap; using Win.Sfs.SettleAccount.Entities.Prices; using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.ExcelImporter; using Win.Sfs.SettleAccount.ExportReports; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs index c3de3f3d..0d087b65 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs @@ -43,7 +43,6 @@ using Magicodes.ExporterAndImporter.Core.Models; using TaskJob.Services; using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; using Win.Sfs.SettleAccount.Entities.Wms; using Win.Sfs.SettleAccount.Repository; @@ -62,14 +61,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts private readonly IExcelImportAppService _excelImportService; private readonly ISettleAccountBranchEfCoreRepository _preBatchRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; + private readonly ISettleAccountBranchEfCoreRepository _repository; private readonly ISettleAccountBranchEfCoreRepository _versionRepository; private readonly ISettleAccountBranchEfCoreRepository _fisRepository; private readonly ISettleAccountBranchEfCoreRepository _relrepository; - - private readonly WMSEfCoreRepository _wmsefRespository; private readonly TaskJobService _service; /// /// 构建方法 @@ -88,10 +84,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts TaskJobService service, ISettleAccountBranchEfCoreRepository fisRepository, ISettleAccountBranchEfCoreRepository preBatchRepository, - ISettleAccountBranchEfCoreRepository relrepository, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository + ISettleAccountBranchEfCoreRepository relrepository ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) { _service = service; @@ -102,9 +95,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts _repository = repository; _preBatchRepository = preBatchRepository; _relrepository = relrepository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs deleted file mode 100644 index de2463a5..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs +++ /dev/null @@ -1,468 +0,0 @@ - - - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Caching.Distributed; -using Shouldly; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Volo.Abp.ObjectMapping; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices; -using Win.Sfs.SettleAccount.Entities.ImportMap; -using Win.Sfs.SettleAccount.Entities.Materials; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.Shared.CacheBase; -using Win.Sfs.Shared.Filter; -using Win.Utils; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.SettlementParts; -using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences; -using Win.Sfs.SettleAccount.Entities.SettlementCrossReference; -using System.IO; - -namespace Win.Sfs.SettleAccount.SettlementCrossReferences -{ - - /// - /// չϵ - /// - //[AllowAnonymous] - [Route("api/settleaccount/SettlementCrossReference")] - [Authorize(SettleAccountPermissions.Boms.Default)] - public class SettlementCrossReferenceAppService : SettleAccountApplicationBase, ISettlementCrossReferenceAppService - { - - private readonly IObjectMapper _objectMapper; - - private readonly ISettleAccountBranchEfCoreRepository _repository; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - private readonly ISettleAccountBranchEfCoreRepository _preBatchRepository; - private readonly ISettleAccountBranchEfCoreRepository _relrepository; - - - - /// - /// - /// - /// UID - /// Զmap - /// ִӿ - /// - public SettlementCrossReferenceAppService(IGuidGenerator guidGenerator, - IObjectMapper objectMapper, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ISettleAccountBranchEfCoreRepository repository, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository materialRepository, - ISettleAccountBranchEfCoreRepository importColumnMapRepository, - ISettleAccountBranchEfCoreRepository relationRepository, - ISettleAccountBranchEfCoreRepository priceRepository, - ISettleAccountBranchEfCoreRepository preBatchRepository, - ISettleAccountBranchEfCoreRepository relrepository, - - IDistributedCache cache - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - //_guidGenerator = guidGenerator; - _objectMapper = objectMapper; - _repository = repository; - //_excelImportService = excelImportService; - _versionRepository = versionRepository; - _relrepository = relrepository; - _preBatchRepository = preBatchRepository; - //_materialRepository = materialRepository; - //_importColumnMapRepository = importColumnMapRepository; - //_relationRepository = relationRepository; - //_priceRepository = priceRepository; - } - - - ///// - /// - /// ɸѡȡʵб - /// - /// - /// :ɸѡб,,,ҳ - /// - /// - /// ʵDTOб - [HttpPost] - [Route("list")] - //[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)] - public async Task> GetListAsync(SettlementCrossReferenceRequestDto input) - { - - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - - - 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); - // var dtos = _objectMapper.Map(entities); - return new PagedResultDto(totalCount, dtos); - } - - - private async Task GetCountAsync(SettlementCrossReferenceRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - private async Task GetCountAsync(SettlementCrossReferenceVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - ///// - /// - /// ɸѡȡʵб - /// - /// - /// :ɸѡб,,,ҳ - /// - /// - /// ʵDTOб - [HttpPost] - [Route("versionlist")] - //[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)] - public async Task> GetVersionListAsync(SettlementCrossReferenceVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = _objectMapper.Map, List>(entities); - //foreach (var itm in dtos) - //{ - // itm.Version = itm.Version + string.Format("({0})", itm.Factory); - //} - return new PagedResultDto(totalCount, dtos); - } - - - - /////// - ///// - ///// - ///// - ///// - //[HttpPost] - //[Route("ExcelImport")] - //[DisableRequestSizeLimit] - ////[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)] - //public async Task SettlementCrossReferenceUploadCSVImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory) - //{ - // List _setls = new List(); - // List _errorList = new List(); - // var _id = GuidGenerator.Create(); - // var checkList = new List(); - // //var _chList = await _relrepository.GetAllAsync(GuidGenerator.Create(), true); - // //var _chls = _chList.Select(p => p.SettleMaterialCode).Distinct(); - - - - // var _VersionList = new List(); - // _VersionList.Add(new SettlementCrossReferenceVersion(_id, branchId, year, period, version, customerCode, factory)); - - - // List _precodeList = new List();// - // using (TextReader textReader = new StreamReader(files[0].OpenReadStream())) - // { - // //var _preList = _preBatchRepository.Where(p => p.State == 3).ToList(); - // var _versionQuery = _versionRepository.Where(p => p.Version == version); - // await _versionQuery.BatchDeleteAsync(); - // var _query = _repository.Where(p => p.Version == version); - // await _query.BatchDeleteAsync(); - // int i = 0; - // //var _userId = CurrentUser.Id.Value; - // while (true) - // { - // string str = await textReader.ReadLineAsync(); - // if (string.IsNullOrEmpty(str)) - // { - // break; - // } - // else - // { - // //if (i > headerNumber) - // //{ - // try - // { - // var _lst = str.Split(new char[] { ',' }).ToList(); - // //string _period = _lst[1].Trim(); - // string _factory = ""; - // //_lst[0].Trim(); - // string _model = _lst[0].Trim(); - // string _partType = _lst[1].Trim(); - // string _settlementMaterialCode = _lst[2].Trim(); - // if (string.IsNullOrEmpty(_settlementMaterialCode)) - // { - // continue; - // } - // string _bomMaterialCode = _lst[3].Trim(); - // string _materialDesc = _lst[3].Trim(); - // string _supplierCode = _lst[4].Trim(); - // string _supplierDesc = _lst[4].Trim(); - // string _buyer = _lst[5].Trim(); - // //string _customerCode = _lst[10].Trim(); - - // //if (_preList.Any(p => p.KENNCode == _kENNCode)) - // //{ - // // _precodeList.Add(_kENNCode); - - // //} - // _setls.Add(new SettlementCrossReference( - // GuidGenerator.Create(), - // year, - // period, - // _factory, - // _model, - // _partType, - // _settlementMaterialCode, - // _bomMaterialCode, - // _materialDesc, - // _supplierCode, - // _supplierDesc, - // _buyer, - // customerCode, - // version - // )); - // } - // catch - // { - // } - // //} - // } - // i++; - // } - // textReader.Close(); - // } - - // var _ls = _setls; - - // var query = from arc in _ls - // group arc by new { arc.Version, arc.SettlementMaterialCode, arc.BomMaterialCode } - // into g - // where g.Count() > 1 - // select g; - - // var _l = _setls.Select(p => p.SettlementMaterialCode).Distinct(); - - // //var _notls = _l.Where(p => !_chls.Contains(p)).ToList(); - - // //foreach (var itm in _notls) - // //{ - // // checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, itm, string.Empty, string.Format("ϵвڽϺ{0}", itm), string.Empty)); - // //} - - // foreach (var itm in query) - // { - // checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ڼ{0} ܳɽ {1} Bom嵥{2} ظ", itm.Key.SettlementMaterialCode, itm.Key.BomMaterialCode, itm.Key.Version), string.Empty)); - // } - - // if (checkList.Count > 0) - // { - // return await ExportErrorReportAsync(checkList); - // } - - // //var _existls = _preBatchRepository.Where(p => _precodeList.Contains(p.KENNCode)).ToList(); - // //if (_existls.Count > 0) - // //{ - // // foreach (var itm in _existls) - // // { - // // itm.Update(string.Format("޸Ԥ{0}", DateTime.Now.ToString("yyyyMMdd")), 0, string.Empty, string.Empty, string.Empty); - // // } - // //} - // //await _preBatchRepository.GetDbContext().BulkUpdateAsync(_existls); - // await _repository.GetDbContext().BulkInsertAsync(_setls); - - // await _versionRepository.GetDbContext().BulkInsertAsync(_VersionList); - - // //await _versionRepository.InsertAsync(new SettlementCrossReferenceVersion(_id, branchId, year, period, version, customerCode, factory)); - - // return ApplicationConsts.SuccessStr; - //} - - - /// - /// - /// - /// - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - public async Task SettlementCrossReferenceUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory) - { - - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - var _versionQuery = _versionRepository.Where(p => p.Version == version && p.CustomerCode == customerCode); - await _versionQuery.BatchDeleteAsync(); - var _query = _repository.Where(p => p.Version == version && p.CustomerCode == customerCode); - await _query.BatchDeleteAsync(); - - List _errorList = new List(); - var _id = GuidGenerator.Create(); - var checkList = new List(); - - - var _VersionList = new List(); - _VersionList.Add(new SettlementCrossReferenceVersion(_id, branchId, year, period, version, customerCode, factory)); - - - foreach (var itm in entityList) - { - - if (itm.SettlementMaterialCode.StartsWith("preser")) - { - - } - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, customerCode, factory); - } - - - //foreach (var itm in entityList) - //{ - - // checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ڼ{0} ܳɽ {1} Bom嵥{2} ظ", itm.Key.SettlementMaterialCode, itm.Key.BomMaterialCode, itm.Key.Version), string.Empty)); - //} - - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - await _repository.GetDbContext().BulkInsertAsync(entityList); - - await _versionRepository.GetDbContext().BulkInsertAsync(_VersionList); - - - return ApplicationConsts.SuccessStr; - } - - /// - /// ļ - /// - /// - /// - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(SettlementCrossReferenceRequestDto input) - { - - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - if (input.ParentId != Guid.Empty) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "ParentId", Logic = EnumFilterLogic.And, Value = input.ParentId.ToString() }); - } - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - // - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("չϵ_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("չϵ__{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //浼ļɶ - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - - [HttpGet] - [Route("Create")] - - public Task CreateAsync(SettlementCrossReferenceCreateDto input) - { - throw new NotImplementedException(); - } - - [HttpGet] - [Route("DeleteList")] - - public Task DeleteListAsync(List ids) - { - throw new NotImplementedException(); - } - - [HttpGet] - [Route("{id}")] - - public Task GetAsync(Guid id) - { - throw new NotImplementedException(); - } - - - [HttpGet] - [Route("GetTotalCountAsync")] - - public Task GetTotalCountAsync(Guid branchId) - { - throw new NotImplementedException(); - } - - - - [HttpGet] - [Route("Update")] - - public Task UpdateAsync(Guid id, SettlementCrossReferenceUpdateDto input) - { - throw new NotImplementedException(); - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs deleted file mode 100644 index dda77030..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs +++ /dev/null @@ -1,229 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using Shouldly; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Volo.Abp.ObjectMapping; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.Inventories; -using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion; -using Win.Sfs.SettleAccount.Entities.Materials; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartss; -using Win.Sfs.SettleAccount.Entities.SettlementParts; -using Win.Sfs.SettleAccount.Entities.SettlementPartss; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Inventories; -using Win.Sfs.Shared.CacheBase; -using Win.Sfs.Shared.Filter; -using Win.Utils; - -namespace Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePart -{ - - /// - /// ɢӦϵ - /// - [Authorize(SettleAccountPermissions.Boms.Default)] - //[AllowAnonymous] - [Route("api/settleaccount/SettlementPakAndSpareParts")] - public class SettlementPakAndSparePartsAppService : SettleAccountApplicationBase, ISettlementPakAndSparePartsAppService - { - private readonly IObjectMapper _objectMapper; - private readonly IExcelImportAppService _excelImportService; - private readonly ISettleAccountBranchEfCoreRepository _repository; - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - /// - /// - /// - /// ִӿ - /// - public SettlementPakAndSparePartsAppService( - - ISettleAccountBranchEfCoreRepository repository, - ISettleAccountBranchEfCoreRepository versionRepository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - - _versionRepository = versionRepository; - _excelImportService = excelImportService; - _repository = repository; - } - - /// - /// IDȡΨһʵ - /// - /// - /// ʵȫ - /// - /// ID - /// ʵDTO - //[HttpGet] - //[Route("{id}")] - //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)] - //virtual public async Task GetAsync(Guid id) - //{ - // var result = await GetFromCacheAsync(id); - // var dto = ObjectMapper.Map(result); - // return dto; - //} - - //private async Task GetFromCacheAsync(Guid id) - //{ - // var result = await _repository.GetAsync(id); - - - // return result; - //} - - private async Task GetCountAsync(SettlementPakAndSparePartsRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - private async Task GetCountAsync(SettlementPakAndSparePartsVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - ///// - /// - /// ɸѡȡʵб - /// - /// - /// :ɸѡб,,,ҳ - /// - /// - /// ʵDTOб - [HttpPost] - [Route("list")] - //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)] - public async Task> GetListAsync(SettlementPakAndSparePartsRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - if (!string.IsNullOrEmpty(input.CustomerCode)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "CustomerCode", Logic = EnumFilterLogic.And, Value = input.CustomerCode }); - } - 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); - // var dtos = _objectMapper.Map(entities); - return new PagedResultDto(totalCount, dtos); - } - - [HttpPost] - [Route("versionList")] - //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)] - public async Task> GetVersionListAsync(SettlementPakAndSparePartsVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - //foreach (var itm in dtos) - //{ - // itm.Version = itm.Version + string.Format("({0})", itm.Factory); - //} - return new PagedResultDto(totalCount, dtos); - } - - [HttpGet] - [Route("delete")] - //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)] - public Task DeleteListAsync(List ids) - { - throw new NotImplementedException(); - } - - [HttpGet] - [Route("GetBy")] - //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)] - public Task GetAsync(Guid id) - { - throw new NotImplementedException(); - } - - - /// - /// ļ - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettlementParts.Default)] - virtual public async Task ExportAsync(SettlementPakAndSparePartsDto input) - { - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - //Ϲ-20210927 - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - - if (!string.IsNullOrEmpty(input.CustomerCode)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "CustomerCode", Logic = EnumFilterLogic.And, Value = input.CustomerCode }); - } - - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - // - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("ɢӦϵ_{0}.csv", _snowflakeIdGenerator.Create().ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("ɢӦϵ_{0}.xlsx", _snowflakeIdGenerator.Create().ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //浼ļɶ - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs index bb0a728c..484d33b4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs @@ -27,9 +27,7 @@ using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.CommonManagers; using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.EstimatedInventories; using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.ExcelImporter; using Win.Sfs.SettleAccount.ExportReports; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs deleted file mode 100644 index aebf1c07..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs +++ /dev/null @@ -1,343 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - ///大众FIS未结算明细导入功能 - /// - [Authorize(SettleAccountPermissions.UnSettleAccount.Default)] - //[AllowAnonymous] - [Route("api/settleaccount/UnSettleAccount")] - public class UnSettleAccountAppService : SettleAccountApplicationBase, IUnSettleAccountAppService - { - - private readonly IExcelImportAppService _excelImportService; - - private readonly ISettleAccountBranchEfCoreRepository _preBatchRepository; - private readonly ISettleAccountBranchEfCoreRepository _repository; - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - private readonly ISettleAccountBranchEfCoreRepository _fisRepository; - private readonly ISettleAccountBranchEfCoreRepository _relrepository; - private readonly TaskJobService _service; - /// - /// 构建方法 - /// - /// 构建UID - - /// 仓储接口 - /// 缓存 - public UnSettleAccountAppService(IGuidGenerator guidGenerator, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository repository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - TaskJobService service, - ISettleAccountBranchEfCoreRepository fisRepository, - ISettleAccountBranchEfCoreRepository preBatchRepository, - ISettleAccountBranchEfCoreRepository relrepository - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _service = service; - _fisRepository = fisRepository; - _versionRepository = versionRepository; - - _excelImportService = excelImportService; - _repository = repository; - _preBatchRepository = preBatchRepository; - _relrepository = relrepository; - } - /// - /// 导入功能,做成任务下载 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [Authorize(SettleAccountPermissions.UnSettleAccount.Create)] - public async Task UnSettleAccountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, - string year, string period, string version, string customerCode, string factory) - { - - List customConditionList = new List(); - customConditionList.Add(new CustomCondition() { Name = "Version", Value = version }); - customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode }); - customConditionList.Add(new CustomCondition() { Name = "Year", Value = year }); - customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory }); - var _taskid = await _service.ImportEnqueueAsync(files, "大众FIS未结算明细", CurrentUser, typeof(UnSettleAccountImportService), customConditionList, (rs) => { - - }); - return _taskid; - } - - /// - /// 按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; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - - - return result; - } - - - private async Task GetCountAsync(UnSettleAccountRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - private async Task GetCountAsync(UnSettleAccountVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - - /// - /// 导出文件 - /// - /// - /// - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(UnSettleAccountRequestDto input) - { - - IExporter _csv = new CsvExporter(); - - IExporter _excel = new ExcelExporter(); - - //if (input.ParentId != Guid.Empty) - //{ - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "ParentId", Logic = EnumFilterLogic.And, Value = input.ParentId.ToString() }); - //} - if (input.Version != string.Empty) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() }); - } - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("大众FIS未结算明细_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("大众FIS未结算明细_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - - - - - - ///// - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - [HttpPost] - [Route("list")] - virtual public async Task> GetListAsync(Guid id, UnSettleAccountRequestDto input) - { - if (input.Version != string.Empty) - { - // var _entity = await _versionRepository.GetAsync(input.ParentId); - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() }); - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "ParentId", Logic = EnumFilterLogic.And, Value = input.ParentId.ToString() }); - } - else - { - return new PagedResultDto(0, new List()); - } - 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); - } - - - /// - /// 获取实体总数 - /// - /// 实体总数 - [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); - var dtos = ObjectMapper.Map, List>(entities); - return new ListResultDto(dtos); - } - - - - - /// - /// 删除实体 - /// - /// ID - /// 无 - [HttpDelete] - [Route("{id}")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteAsync(Guid id) - { - var entity = await GetFromCacheAsync(id); - - await _repository.DeleteAsync(id); - } - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - [HttpPost] - [Route("delete")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteListAsync(List ids) - { - foreach (var id in ids) - { - var entity = await GetFromCacheAsync(id); - //await Cache.DeleteAsync(id.ToString()); - } - - return await _repository.DeleteListAsync(ids); - } - - - - /// - ///调用存储 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - [HttpPost] - [Route("listversion")] - - - public async Task> GetVersionListAsync(UnSettleAccountVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - - - - - return new PagedResultDto(totalCount, dtos); - } - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs deleted file mode 100644 index 7a570e4d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs +++ /dev/null @@ -1,320 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using Microsoft.AspNetCore.Authorization; -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.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.Shared.Filter; -using EFCore.BulkExtensions; -using Win.Sfs.SettleAccount.Constant; -using Volo.Abp.Application.Dtos; -using Win.Sfs.SettleAccount.Entities.VWKanBanVersion; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Shouldly; -using Volo.Abp; - -namespace Win.Sfs.SettleAccount.Entities.VWKanBan -{ - /// - /// 大众看板结算明细导入 - /// - [Authorize(SettleAccountPermissions.VWKanBan.Default)] - [Route("api/settleaccount/VWKanBan")] - public class VWKanBanAppService : SettleAccountApplicationBase, IVWKanBanAppService - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IExcelImportAppService _excelImportService; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _repository; - /// - /// 构建方法 - /// - /// 构建UID - /// 仓储接口 - /// 缓存 - public VWKanBanAppService(IGuidGenerator guidGenerator, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository repository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _versionRepository = versionRepository; - _guidGenerator = guidGenerator; - _excelImportService = excelImportService; - _repository = repository; - } - - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [Authorize(SettleAccountPermissions.VWKanBan.Create)] - public async Task VWKanBanUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode) - { - if(string.IsNullOrEmpty(version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - List listImport = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - //删除版本 - var _versionQuery = _versionRepository.Where(p => p.Version == version); - await _versionQuery.BatchDeleteAsync(); - //删除明细 - var _query = _repository.Where(p => p.Version == version); - await _query.BatchDeleteAsync(); - //插入数据前检验 - var checkList = new List(); - var _group = entityList.GroupBy(x => new { x.Kanban, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Kanban = p.Key.Kanban, MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _group) - { - if (itm.Count > 1) - { - checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其看板条码号{1}有重复数据，请检查！", itm.MaterialCode, itm.Kanban), string.Empty)); - } - } - var _id = GuidGenerator.Create(); - var _bomList = new List(); - _bomList.Add(new KanBanVersion(_id, branchId, year, period, version, customerCode)); - foreach (var itm in entityList) - { - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, _id); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - 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; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(VWKanBanRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - private async Task GetCountAsync(VWKanBanVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - /// - /// 导出文件 - /// - /// - /// - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(VWKanBanRequestDto input) - { - - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("大众看板结算明细_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("大众看板结算明细_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - [HttpPost] - [Route("list")] - - virtual public async Task> GetListAsync(VWKanBanRequestDto input) - { - - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0, new List()); - } - var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), 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); - } - - - /// - /// 获取实体总数 - /// - /// 实体总数 - [HttpGet] - [Route("count")] - - virtual public async Task GetTotalCountAsync(Guid branchId) - { - return await _repository.GetCountAsync(branchId); - } - - /// - /// 获取全部实体列表 - /// - /// 实体DTO列表 - [HttpGet] - [Route("all")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetAllAsync(Guid branchId) - { - var entities = await _repository.GetAllAsync(branchId, true); - - - var dtos = ObjectMapper.Map, List>(entities); - - - return new ListResultDto(dtos); - } - - - - /// - /// 删除实体 - /// - /// ID - /// 无 - [HttpDelete] - [Route("{id}")] - /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteAsync(Guid id) - { - await _repository.DeleteAsync(id); - } - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - [HttpPost] - [Route("delete")] - - virtual public async Task DeleteListAsync(List ids) - { - foreach (var id in ids) - { - var entity = await GetFromCacheAsync(id); - //await Cache.DeleteAsync(id.ToString()); - } - - return await _repository.DeleteListAsync(ids); - } - - - - /// - /// 版本列表查询 - /// - /// - /// - [HttpPost] - [Route("listversion")] - [Authorize(SettleAccountPermissions.VWKanBan.Default)] - public async Task> GetVersionListAsync(VWKanBanVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - - return new PagedResultDto(totalCount, dtos); - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs deleted file mode 100644 index 4f8ae907..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs +++ /dev/null @@ -1,316 +0,0 @@ -using Microsoft.AspNetCore.Authorization; -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; -using Volo.Abp.Caching; -using Volo.Abp.Guids; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.Filter; -using EFCore.BulkExtensions; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Volo.Abp.Domain.Repositories; -using Magicodes.ExporterAndImporter.Core; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; - -namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims -{ - /// - /// 大众CP7报废和索赔导入 - /// - [Authorize(SettleAccountPermissions.ScrapClaims.Default)] - //[AllowAnonymous] - [Route("api/settleaccount/ScrapClaims")] - public class ScrapClaimsAppService : SettleAccountApplicationBase, IScrapClaimsAppService - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IExcelImportAppService _excelImportService; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _repository; - /// - /// 构建方法 - /// - /// 构建UID - /// 仓储接口 - /// 缓存 - public ScrapClaimsAppService(IGuidGenerator guidGenerator, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository repository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _versionRepository = versionRepository; - _guidGenerator = guidGenerator; - _excelImportService = excelImportService; - _repository = repository; - } - - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [Authorize(SettleAccountPermissions.ScrapClaims.Create)] - public async Task ScrapClaimsUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode) - { - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - //删除版本 - var _versionQuery = _versionRepository.Where(p => p.Version == version); - await _versionQuery.BatchDeleteAsync(); - //删除明细 - var _query = _repository.Where(p => p.Version == version); - await _query.BatchDeleteAsync(); - //插入数据前检验 - var checkList = new List(); - var _group = entityList.GroupBy(x => new { x.Type, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Type = p.Key.Type, MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _group) - { - if (string.IsNullOrEmpty(itm.Type)) - { - checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其类型标识{1}有空，请检查！", itm.MaterialCode, itm.Type), string.Empty)); - } - } - var _id = GuidGenerator.Create(); - var _bomList = new List(); - _bomList.Add(new ScrapClaimsVersion(_id, branchId, year, period, version, customerCode)); - foreach (var itm in entityList) - { - //赋值上主键ID - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - return ApplicationConsts.SuccessStr; - } - - /// - /// 按ID获取唯一实体 - /// - /// - /// 返回实体全部属性 - /// - /// ID - /// 实体DTO - [HttpGet] - [Route("{id}")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task GetAsync(Guid id) - { - var result = await GetFromCacheAsync(id); - var dto = ObjectMapper.Map(result); - return dto; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(ScrapClaimsRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - private async Task GetCountAsync(ScrapClaimsVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - /// - /// 导出文件 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(ScrapClaimsRequestDto input) - { - - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("CP7报废和索赔明细_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("CP7报废和索赔明细_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - [HttpPost] - [Route("list")] - - virtual public async Task> GetListAsync(ScrapClaimsRequestDto input) - { - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0, new List()); - } - 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); - } - - - /// - /// 获取实体总数 - /// - /// 实体总数 - [HttpGet] - [Route("count")] - [Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task GetTotalCountAsync(Guid branchId) - { - return await _repository.GetCountAsync(branchId); - } - - /// - /// 获取全部实体列表 - /// - /// 实体DTO列表 - [HttpGet] - [Route("all")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetAllAsync(Guid branchId) - { - var entities = await _repository.GetAllAsync(branchId, true); - - - var dtos = ObjectMapper.Map, List>(entities); - - - return new ListResultDto(dtos); - } - - - - /// - /// 删除实体 - /// - /// ID - /// 无 - [HttpDelete] - [Route("{id}")] - /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteAsync(Guid id) - { - await _repository.DeleteAsync(id); - } - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - [HttpPost] - [Route("delete")] - // [Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteListAsync(List ids) - { - foreach (var id in ids) - { - var entity = await GetFromCacheAsync(id); - //await Cache.DeleteAsync(id.ToString()); - } - - return await _repository.DeleteListAsync(ids); - } - - - - /// - /// 版本列表查询 - /// - /// - /// - [HttpPost] - [Route("listversion")] - public async Task> GetVersionListAsync(ScrapClaimsVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - - return new PagedResultDto(totalCount, dtos); - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs deleted file mode 100644 index aa3dc008..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs +++ /dev/null @@ -1,497 +0,0 @@ -using EFCore.BulkExtensions; -using Microsoft.AspNetCore.Authorization; -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; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Shouldly; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Win.Sfs.Shared.Filter; -using Volo.Abp; - -namespace Win.Sfs.SettleAccount.Entities.VWSparePart -{ - /// - /// 大众备件服务 - /// - [Route("api/settleaccount/SparePart")] - [Authorize(SettleAccountPermissions.SparePart.Default)] - public class SparePartAppService : SettleAccountApplicationBase, ISparePartAppService - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IExcelImportAppService _excelImportService; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _repository; - /// - /// 构建方法 - /// - /// 构建UID - /// 仓储接口 - /// 缓存 - public SparePartAppService(IGuidGenerator guidGenerator, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository repository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _versionRepository = versionRepository; - _guidGenerator = guidGenerator; - _excelImportService = excelImportService; - _repository = repository; - } - - - /// - /// 大众备件明细数据导入功能（以后正常使用的功能），包含导入有空的订单号 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [Authorize(SettleAccountPermissions.SparePart.Create)] - public async Task SparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode) - { - if (string.IsNullOrEmpty(version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - //删除版本 - var _versionQuery = _versionRepository.Where(p => p.Version == version); - await _versionQuery.BatchDeleteAsync(); - //删除明细 - var _query = _repository.Where(p => p.Version == version && p.Extend != "is90"); - await _query.BatchDeleteAsync(); - //插入数据前检验 - var checkList = new List(); - var _group = entityList.GroupBy(x => new { x.LineNumber, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), LineNumber = p.Key.LineNumber, MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _group) - { - if (string.IsNullOrEmpty(itm.MaterialCode)) - { - checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的行号为{0}的物料代码为空，请检查！", itm.LineNumber), string.Empty)); - } - } - var _id = GuidGenerator.Create(); - var _bomList = new List(); - _bomList.Add(new SparePartVersion(_id, branchId, year, period, version, customerCode)); - foreach (var itm in entityList) - { - if (string.IsNullOrEmpty(itm.PurchaseOrderNo)) - { - //订单号不空 - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "not90", "NoOrder"); - } - else - { - //赋值上主键ID - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "not90"); - } - - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - return ApplicationConsts.SuccessStr; - } - - /// - /// 大众备件调整导入（财务期初时用的功能）,订单号+物料号能一对一匹配 - /// - /// - /// - /// - /// - /// - /// - /// - [HttpPost] - [Route("ExcelImport90")] - [DisableRequestSizeLimit] - - public async Task SparePartUploadExcelImport90([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode) - { - if (string.IsNullOrEmpty(version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - //删除版本 - var _versionQuery = _versionRepository.Where(p => p.Version == version); - await _versionQuery.BatchDeleteAsync(); - //删除明细 - var _query = _repository.Where(p => p.Version == version && p.Extend == "is90"); - await _query.BatchDeleteAsync(); - //插入数据前检验 - var checkList = new List(); - var _group = entityList.GroupBy(x => new { x.LineNumber, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), LineNumber = p.Key.LineNumber, MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _group) - { - if (string.IsNullOrEmpty(itm.MaterialCode)) - { - checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的行号为{0}的物料代码为空，请检查！", itm.LineNumber), string.Empty)); - } - } - var _id = GuidGenerator.Create(); - var _bomList = new List(); - _bomList.Add(new SparePartVersion(_id, branchId, year, period, version, customerCode)); - foreach (var itm in entityList) - { - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "is90"); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - 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; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(SparePartRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - private async Task GetCountAsync(SparePartVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - /// - /// 导出文件 - /// - /// - /// - [HttpPost] - [Route("Export")] - - virtual public async Task ExportAsync(SparePartRequestDto input) - { - if (string.IsNullOrEmpty(input.Version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities.Where(p => p.Extend == "not90").ToList()); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("大众备件结算调整_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("大众备件结算调整_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - [HttpPost] - [Route("Export90")] - - virtual public async Task Export90Async(SparePartRequestDto input) - { - if (string.IsNullOrEmpty(input.Version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities.Where(p => p.Extend == "is90").ToList()); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("大众备件结算明细_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("大众备件结算明细_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - //[HttpPost] - //[Route("list")] - ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - //virtual public async Task> GetListAsync(SparePartRequestDto input) - //{ - // if (!string.IsNullOrEmpty(input.Version)) - // { - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - // } - // else - // { - // return new PagedResultDto(0, new List()); - // } - - // var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount, - // input.SkipCount, true); - // if (entities == null || entities.Count == 0) - // { - // return new PagedResultDto(0, null); - // } - // else - // { - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Extend", Logic = EnumFilterLogic.And, Value = "not90"}); - // } - // var totalCount = await GetCountAsync(input); - // var dtos = ObjectMapper.Map, List>(entities.Where(p => p.Extend == "not90").ToList()); - - // return new PagedResultDto(totalCount, dtos); - //} - - [HttpPost] - [Route("list")] - - virtual public async Task> GetListAsync(SparePartRequestDto input) - { - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0, new List()); - } - - 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); - } - - [HttpPost] - [Route("list90")] - - virtual public async Task> GetList90Async(SparePartRequestDto input) - { - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0, new List()); - } - - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - if (entities == null || entities.Count==0) - { - return new PagedResultDto(0, null); - } - else - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Extend", Logic = EnumFilterLogic.And, Value = "is90" }); - } - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities.Where(p=>p.Extend=="is90").ToList()); - - return new PagedResultDto(totalCount, dtos); - } - - - /// - /// 获取实体总数 - /// - /// 实体总数 - [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); - - - var dtos = ObjectMapper.Map, List>(entities); - - - return new ListResultDto(dtos); - } - - - - /// - /// 删除实体 - /// - /// ID - /// 无 - [HttpDelete] - [Route("{id}")] - - virtual public async Task DeleteAsync(Guid id) - { - await _repository.DeleteAsync(id); - } - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - [HttpPost] - [Route("delete")] - - virtual public async Task DeleteListAsync(List ids) - { - foreach (var id in ids) - { - var entity = await GetFromCacheAsync(id); - //await Cache.DeleteAsync(id.ToString()); - } - - return await _repository.DeleteListAsync(ids); - } - - - - /// - /// 版本列表查询 - /// - /// - /// - [HttpPost] - [Route("listversion")] - public async Task> GetVersionListAsync(SparePartVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - - return new PagedResultDto(totalCount, dtos); - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs deleted file mode 100644 index b009082e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs +++ /dev/null @@ -1,317 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.Guids; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.Entities.WMSKanBan; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.Caching; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Volo.Abp; -using Microsoft.AspNetCore.Http; -using Win.Sfs.SettleAccount.ExcelImporter; -using EFCore.BulkExtensions; -using Win.Sfs.SettleAccount.ExportReports; -using Volo.Abp.Domain.Repositories; -using Win.Sfs.SettleAccount.Constant; -using Microsoft.AspNetCore.Authorization; -using Volo.Abp.Application.Dtos; - -namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan -{ - /// - /// 大众看板发货明细 - /// - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - //[AllowAnonymous] - [Route("api/settleaccount/WMSVWKanBan")] - public class WMSKanBanAppService : SettleAccountApplicationBase, IWMSVWKanBanAppService - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IExcelImportAppService _excelImportService; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _repository; - /// - /// 构建方法 - /// - /// 构建UID - /// 仓储接口 - /// 缓存 - public WMSKanBanAppService(IGuidGenerator guidGenerator, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository repository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _versionRepository = versionRepository; - _guidGenerator = guidGenerator; - _excelImportService = excelImportService; - _repository = repository; - } - - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task WMSVWKanBanUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode) - { - if (string.IsNullOrEmpty(version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - List listImport = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - //删除版本 - var _versionQuery = _versionRepository.Where(p => p.Version == version); - await _versionQuery.BatchDeleteAsync(); - //删除明细 - var _query = _repository.Where(p => p.Version == version); - await _query.BatchDeleteAsync(); - //插入数据前检验 - var checkList = new List(); - var _group = entityList.GroupBy(x => new { x.Kanban, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Kanban = p.Key.Kanban, MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _group) - { - if (itm.Count > 1) - { - checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其看板条码号{1}有重复数据，请检查！", itm.MaterialCode, itm.Kanban), string.Empty)); - } - } - var _id = GuidGenerator.Create(); - var _bomList = new List(); - _bomList.Add(new WMSKanBanVersion(_id, branchId, year, period, version, customerCode)); - foreach (var itm in entityList) - { - //itm.SetValue(GuidGenerator.Create(), year, period, version); - itm.SetValue(GuidGenerator.Create(), version); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - 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; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(WMSVWKanBanRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - private async Task GetCountAsync(WMSVWKanBanVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - /// - /// 导出文件 - /// - /// - /// - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(WMSVWKanBanRequestDto input) - { - - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("大众看板发货明细_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("大众看板发货明细_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - [HttpPost] - [Route("list")] - virtual public async Task> GetListAsync(WMSVWKanBanRequestDto input) - { - - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0, new List()); - } - var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), 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); - } - - - /// - /// 获取实体总数 - /// - /// 实体总数 - [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); - - - var dtos = ObjectMapper.Map, List>(entities); - - - return new ListResultDto(dtos); - } - - - - /// - /// 删除实体 - /// - /// ID - /// 无 - [HttpDelete] - [Route("{id}")] - /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteAsync(Guid id) - { - await _repository.DeleteAsync(id); - } - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - [HttpPost] - [Route("delete")] - virtual public async Task DeleteListAsync(List ids) - { - foreach (var id in ids) - { - var entity = await GetFromCacheAsync(id); - //await Cache.DeleteAsync(id.ToString()); - } - - return await _repository.DeleteListAsync(ids); - } - - - - /// - /// 版本列表查询 - /// - /// - /// - [HttpPost] - [Route("listversion")] - public async Task> GetVersionListAsync(WMSVWKanBanVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - - return new PagedResultDto(totalCount, dtos); - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs deleted file mode 100644 index 975862ec..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs +++ /dev/null @@ -1,320 +0,0 @@ -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.WMSSparePart; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.Shared.Filter; -using Shouldly; - - - - -namespace Win.Sfs.SettleAccount.Entities.WMS_SparePart -{ - /// - /// 大众备件服务 - /// - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - [Route("api/settleaccount/WMSSparePart")] - public class WMSSparePartAppService : SettleAccountApplicationBase, IWMSSparePartAppService - { - private readonly IGuidGenerator _guidGenerator; - - private readonly IExcelImportAppService _excelImportService; - - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _repository; - /// - /// 构建方法 - /// - /// 构建UID - /// 仓储接口 - /// 缓存 - public WMSSparePartAppService(IGuidGenerator guidGenerator, - ISettleAccountBranchEfCoreRepository versionRepository, - ISettleAccountBranchEfCoreRepository repository, - IDistributedCache cache, - IExcelImportAppService excelImportService, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _versionRepository = versionRepository; - _guidGenerator = guidGenerator; - _excelImportService = excelImportService; - _repository = repository; - } - - - /// - /// 导入功能 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - public async Task WMSSparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode) - { - if (string.IsNullOrEmpty(version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var entityList = ObjectMapper.Map, List>(result); - //删除版本 - var _versionQuery = _versionRepository.Where(p => p.Version == version); - await _versionQuery.BatchDeleteAsync(); - //删除明细 - var _query = _repository.Where(p => p.Version == version); - await _query.BatchDeleteAsync(); - //插入数据前检验 - var checkList = new List(); - var _group = entityList.GroupBy(x => new { x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _group) - { - if (string.IsNullOrEmpty(itm.MaterialCode)) - { - checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的行号为{0}的物料代码为空，请检查！", itm.MaterialCode), string.Empty)); - } - } - var _id = GuidGenerator.Create(); - var _bomList = new List(); - _bomList.Add(new WMSSparePartVersion(_id, branchId, year, period, version, customerCode)); - foreach (var itm in entityList) - { - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - 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; - } - - - private async Task GetFromCacheAsync(Guid id) - { - var result = await _repository.GetAsync(id); - return result; - } - - - private async Task GetCountAsync(WMSSparePartRequestDto input) - { - return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - private async Task GetCountAsync(WMSSparePartVersionRequestDto input) - { - return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters); - } - - - /// - /// 导出文件 - /// - /// - /// - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(WMSSparePartRequestDto input) - { - if (string.IsNullOrEmpty(input.Version)) - { - throw new BusinessException("版本不能空，必须传入！"); - } - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; - switch (input.FileType) - { - case 0: - _fileName = string.Format("大众备件发货明细_{0}.csv", input.UserId.ToString()); - result = await _csv.ExportAsByteArray(dtoDetails); - break; - case 1: - _fileName = string.Format("大众备件发货明细_{0}.xlsx", input.UserId.ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - break; - } - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - /// - /// 根据筛选条件获取实体列表 - /// - /// - /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码 - /// - /// 请求条件 - /// 实体DTO列表 - [HttpPost] - [Route("list")] - virtual public async Task> GetListAsync(WMSSparePartRequestDto input) - { - if (!string.IsNullOrEmpty(input.Version)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - } - else - { - return new PagedResultDto(0, new List()); - } - - 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); - } - - - /// - /// 获取实体总数 - /// - /// 实体总数 - [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); - - - var dtos = ObjectMapper.Map, List>(entities); - - - return new ListResultDto(dtos); - } - - - - /// - /// 删除实体 - /// - /// ID - /// 无 - [HttpDelete] - [Route("{id}")] - virtual public async Task DeleteAsync(Guid id) - { - await _repository.DeleteAsync(id); - } - - /// - /// 按IDs删除实体列表 - /// - /// IDs - /// 是否执行成功 - [HttpPost] - [Route("delete")] - // [Authorize(SettleAccountPermissions.SettleAccounts.Delete)] - virtual public async Task DeleteListAsync(List ids) - { - foreach (var id in ids) - { - var entity = await GetFromCacheAsync(id); - //await Cache.DeleteAsync(id.ToString()); - } - - return await _repository.DeleteListAsync(ids); - } - - - - /// - /// 版本列表查询 - /// - /// - /// - [HttpPost] - [Route("listversion")] - public async Task> GetVersionListAsync(WMSSparePartVersionRequestDto input) - { - var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var dtos = ObjectMapper.Map, List>(entities); - - return new PagedResultDto(totalCount, dtos); - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs deleted file mode 100644 index f6516f4a..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs +++ /dev/null @@ -1,655 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// 红旗H平台准时化-出库 - /// - - - [Authorize(SettleAccountPermissions.WMSHQ.Default)] - [Route("api/settleaccount/WMSCusomerKanbanoutput")] - public class WMSCusomerKanbanAppService : - SettleAccountApplicationBase - { - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - private readonly ErpPartDapperRepository _erpdapperRepository; - - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - public WMSCusomerKanbanAppService( - - - IExcelImportAppService excelImportService, - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ErpPartDapperRepository erpdapperRepository, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - _erpdapperRepository = erpdapperRepository; - } - - private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsCustomerKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync( WmsKanbanOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsCustomerKanbanDetailList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) - { - //不用传version 单号能保证唯一 - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() }); - - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsCustomerKanbanOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsHQHKanbanAudit(List ids) - { - var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - - ///// - ///// 选择任务，生成出库单，只包含已确认的单据 - ///// - ///// - ///// - ///// - //[HttpPost] - //[Route("WmsWithOutKanbanOutPut")] - //public async Task WmsWithOutKanbanOutPut(WmsJitRequestDto input) - //{ - // var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - // var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - // if (_joblist.Count() > 0) - // { - // var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - // List _lst = new List(); - // foreach (var filename in fileList) - // { - // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - // var _list = _excelHelper.ExcelToList(); - // foreach (var itm in _list) - // { - - // var _entity= new WmsCustomerKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc - // , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode, - // _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm. - // ); - - // _lst.Add(_entity); - // } - - // } - - // var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync(); - - - // await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - // int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - // if (_count == 0) - // { - // var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - - // await _wmsVersionRepository.InsertAsync(_version, true); - // } - - // foreach (var job in _joblist) - // { - // job.FileName = _billNum; - // await _job.UpdateAsync(job); - // } - // } - - // return ApplicationConsts.SuccessStr; ; - //} - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsCustomerKanbanOutPut")] - public async Task WmsCustomerKanbanOutPut(WmsJitRequestDto input) - { - var _billNum = "CKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - foreach (var itm in _list) - { - itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create(),itm.CustomerCode); - } - _lst.AddRange(_list.ToArray()); - } - - foreach (var itm in _lst) - { - if (string.IsNullOrEmpty(itm.Kanban)) - { - itm.Kanban = "WMSDBoardNum"; - } - } - - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.SapMaterialCode, itm1.Kanban } - equals - new { itm2.SapMaterialCode, itm2.Kanban } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.SapMaterialCode, itm1.Kanban } - equals - new { itm2.SapMaterialCode, itm2.Kanban } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,"",string.Empty); - _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - await _wmsVersionRepository.InsertAsync(_version, true); - } - - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - else - { - _billNum = string.Empty; - } - return ApplicationConsts.SuccessStr; ; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsCustomerKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsCustomerKanbanOutPutPass(WmsJitRequestDto input) - { - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - - - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 23,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()) - ); - - - - return true; - - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsCustomerKanbanOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsCustomerKanbanOutPutCancel(WmsJitRequestDto input) - { - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - - - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 23,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 23\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version,string customerCode) - { - var _billNum = "CKB(" +customerCode+")"+ DateTime.Now.ToString("yyyyMMddhhmmss"); - var checkList = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - - //检验1:导入模板中的第一页签数据不能为空 - if (result == null || result.Count() == 0) - { - checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); - } - - var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.SapMaterialCode));//过滤掉物料号为空的数据 - - //和物料主数据中SAP物料号检验是否存在 - foreach (var itm in filteResult) - { - if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode)) - { - checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty)); - } - } - - //检验2:导入模板中的结算数据是否为0 - foreach (var itm in filteResult) - { - if (itm.Qty == 0) - { - checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中物料号{0}的结算数量为０，影响出库请检查！", itm.SapMaterialCode), string.Empty)); - } - } - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - List _lst = new List(); - var _lsCopy = new List(); - foreach (var itm in filteResult) - { - WmsCustomerKanbanOutPutDetial _detail = new WmsCustomerKanbanOutPutDetial( - GuidGenerator.Create(), - !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, - itm.Kanban, - itm.SapMaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1)?itm.Extend1: string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.MaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - ,itm.Qty - - ,itm.Price - ,itm.Amt - ,itm.CustomerCode - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - //看板编号为空，加个默认值 - foreach (var itm in _lst) - { - if (string.IsNullOrEmpty(itm.Kanban)) - { - itm.Kanban = "WMSDBoardNum"; - } - } - - //检验3：导入模板中物料号，不能重复 - var _isRepeatOfReportList = from arc in _lst - group arc by new { arc.Kanban, arc.SapMaterialCode, arc.Version } - into g - where g.Count() > 1 - select g; - foreach (var itm in _isRepeatOfReportList) - { - checkList.Add(new ErrorExportDto(version, "自定义出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中物料号{0}有重复，请检查！", itm.Key.SapMaterialCode), string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State != 4 ).ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.SapMaterialCode, itm1.Kanban } - equals - new { itm2.SapMaterialCode, itm2.Kanban} - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); - - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.SapMaterialCode, itm1.Kanban } - equals - new { itm2.SapMaterialCode, itm2.Kanban } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,customerCode,string.Empty); - - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtos = ObjectMapper.Map, List>(entities); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("自定义客户出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs deleted file mode 100644 index d69d9c5e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs +++ /dev/null @@ -1,569 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// 红旗F平台准时化-出库 - /// - - //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSHQ.Default)] - [Route("api/settleaccount/WMSHQFKanbanoutput")] - public class WmsHQFKanbanAppService : - SettleAccountApplicationBase - { - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - public WmsHQFKanbanAppService( - - - IExcelImportAppService excelImportService, - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - } - - private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsHQFKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync( WmsKanbanOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - - - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsHQFKanbanDetailList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) - { - //不用传version 单号能保证唯一 - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsHQFKanbanOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsHQFKanbanAudit(List ids) - { - var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - - ///// - ///// 选择任务，生成出库单，只包含已确认的单据 - ///// - ///// - ///// - ///// - //[HttpPost] - //[Route("WmsWithOutKanbanOutPut")] - //public async Task WmsWithOutKanbanOutPut(WmsJitRequestDto input) - //{ - // var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - // var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - // if (_joblist.Count() > 0) - // { - // var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - // List _lst = new List(); - // foreach (var filename in fileList) - // { - // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - // var _list = _excelHelper.ExcelToList(); - // foreach (var itm in _list) - // { - - // var _entity= new WmsHQFKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc - // , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode, - // _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm. - // ); - - // _lst.Add(_entity); - // } - - // } - - // var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync(); - - - // await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - // int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - // if (_count == 0) - // { - // var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - - // await _wmsVersionRepository.InsertAsync(_version, true); - // } - - // foreach (var job in _joblist) - // { - // job.FileName = _billNum; - // await _job.UpdateAsync(job); - // } - // } - - // return ApplicationConsts.SuccessStr; ; - //} - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQFKanbanOutPut")] - public async Task WmsHQFKanbanOutPut(WmsJitRequestDto input) - { - var _billNum = "HQFKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - foreach (var itm in _list) - { - itm.SetData(GuidGenerator.Create(), string.Empty, !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, input.Version, GuidGenerator.Create()); - } - _lst.AddRange(_list.ToArray()); - } - - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } - equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty); - _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - await _wmsVersionRepository.InsertAsync(_version, true); - } - - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - else - { - _billNum = string.Empty; - } - return ApplicationConsts.SuccessStr; ; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQFKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsHQFKanbanOutPutPass(WmsJitRequestDto input) - { - if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - { - throw new BusinessException("8989", "填写过账日期应该为当月！"); - - } - - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 5,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()) - ); - - - - return true; - - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 5\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQFKanbanOutPut-Cancel")] - public async Task WmsHQFKanbanOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 5,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - } - - return true; - } - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "HQFKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - List _lst = new List(); - var _lsCopy = new List(); - foreach (var itm in result) - { - WmsHQFKanbanOutPutDetial _detail = new WmsHQFKanbanOutPutDetial( - GuidGenerator.Create(), - !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, - itm.Kanban, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.ParentMaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty, - itm.PoLine - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); - - var checkList = new List(); - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(entities); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs deleted file mode 100644 index 693d4b59..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs +++ /dev/null @@ -1,579 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// 红旗F平台备件-出库 - /// - - [AllowAnonymous] - //[Authorize(SettleAccountPermissions.WMSHQ.Default)] - [Route("api/settleaccount/wmsHQFSharePartoutput")] - public class WMSHQFSharePartAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - private readonly WmsDapperRepository _wmsDapper; - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - public WMSHQFSharePartAppService( - WmsDapperRepository wmsDapper, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _excelImportService = excelImportService; - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _wmsDapper = wmsDapper; - } - - private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) - { - //不用传version 单号能保证唯一 - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock(); - var query = from itm in entities - join itm1 in stockList on itm.MaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsHQHSharePartOutPutDetial( - itm.Id, - itm.WmsBillNum, - itm.OrderBillNum, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - itm.OutPut, - itm.InPut, - itm.State, - itm.Extend1, - itm.Extend2, - itm.Version, - itm.ParentMaterialCode, - itm.BillNum, - itm.TaskId, - itm.Remark, - itm.Qty, - tm1 == null ? 0 : tm1.Qty, - itm.OutPutQty - ); - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartAudit(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut")] - public async Task WmsSharePartOutPut(WmsJitRequestDto input) - { - var _billNum = "BHQF" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - if (_list.Count() > 0) - { - var _lsAry = _list.Select(p => new - WmsHQFSharePartOutPutDetial( - GuidGenerator.Create(), - "", - string.Empty, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - p.Extend1, - p.Extend2, - input.Version, - string.Empty, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty - )); - _lst.AddRange(_lsAry.ToArray()); - } - } - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode} - equals - new { itm2.MaterialCode} - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - foreach (var itm in _lst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - - await _wmsVersionRepository.InsertAsync(_version, true); - } - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - - return ApplicationConsts.SuccessStr; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutPass(WmsJitRequestDto input) - { - if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - { - throw new BusinessException("8989", "填写过账日期应该为当月！"); - - } - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 6,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString())); - - } - } - return true; - } - - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - { - throw new BusinessException("8989", "填写过账日期应该为当月！"); - - } - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 6\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - - - - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Cancel")] - public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 6,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - } - return true; - } - - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartUpdate(WmsHQHSharePartOutPutDetial detial) - { - var _entityList = _wmsRepository.Where(p => p.Id == detial.Id).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutPutQty = detial.OutPutQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - - - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "BHQF" + DateTime.Now.ToString("yyyyMMddhhmmss"); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - List _lst = new List(); - - var _lsCopy = new List(); - foreach (var itm in result) - { - WmsHQFSharePartOutPutDetial _detail = new WmsHQFSharePartOutPutDetial( - GuidGenerator.Create(), - string.Empty, - string.Empty, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.MaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty - ,0 - ,itm.Qty - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode} - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); - - var checkList = new List(); - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(entities); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - } - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs deleted file mode 100644 index 99eca55d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs +++ /dev/null @@ -1,633 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// 红旗H平台准时化-出库 - /// - - //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSHQ.Default)] - [Route("api/settleaccount/WmsHQHKanbanoutput")] - public class WmsHQHKanbanAppService : - SettleAccountApplicationBase - { - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - //private readonly ErpPartDapperRepository _erpdapperRepository; - - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - public WmsHQHKanbanAppService( - - - IExcelImportAppService excelImportService, - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - //ErpPartDapperRepository erpdapperRepository, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - //_erpdapperRepository = erpdapperRepository; - } - - private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsHQHKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync( WmsKanbanOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsHQHKanbanDetailList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) - { - //不用传version 单号能保证唯一 - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsHQHKanbanOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsHQHKanbanAudit(List ids) - { - var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - - ///// - ///// 选择任务，生成出库单，只包含已确认的单据 - ///// - ///// - ///// - ///// - //[HttpPost] - //[Route("WmsWithOutKanbanOutPut")] - //public async Task WmsWithOutKanbanOutPut(WmsJitRequestDto input) - //{ - // var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - // var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - // if (_joblist.Count() > 0) - // { - // var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - // List _lst = new List(); - // foreach (var filename in fileList) - // { - // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - // var _list = _excelHelper.ExcelToList(); - // foreach (var itm in _list) - // { - - // var _entity= new WmsHQHKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc - // , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode, - // _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm. - // ); - - // _lst.Add(_entity); - // } - - // } - - // var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync(); - - - // await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - // int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - // if (_count == 0) - // { - // var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - - // await _wmsVersionRepository.InsertAsync(_version, true); - // } - - // foreach (var job in _joblist) - // { - // job.FileName = _billNum; - // await _job.UpdateAsync(job); - // } - // } - - // return ApplicationConsts.SuccessStr; ; - //} - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQHKanbanOutPut")] - public async Task WmsHQHKanbanOutPut(WmsJitRequestDto input) - { - var _billNum = "HQHKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - foreach (var itm in _list) - { - itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create()); - } - _lst.AddRange(_list.ToArray()); - } - - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } - equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty); - _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - await _wmsVersionRepository.InsertAsync(_version, true); - } - - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - else - { - _billNum = string.Empty; - } - return ApplicationConsts.SuccessStr; ; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQHKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsHQHKanbanOutPutPass(WmsJitRequestDto input) - { - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 3,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()) - ); - - - - return true; - - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQHKanbanOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsHQHKanbanOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 3,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 3\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "HQHKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var checkList = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - - //检验1:导入模板中的第一页签数据不能为空 - if (result == null || result.Count() == 0) - { - checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.Kanban));//过滤掉看板号为空的数据 - - //检验2:导入模板中的结算数据是否为0 - foreach (var itm in filteResult) - { - if (itm.Qty == 0) - { - checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的结算数量为０，影响出库请检查！", itm.Kanban), string.Empty)); - } - if(string.IsNullOrEmpty(itm.WmsBillNum)) - { - checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的交货单号为空，影响出库请检查！", itm.Kanban), string.Empty)); - } - } - - ////和物料主数据中SAP物料号检验是否存在 - //foreach (var itm in filteResult) - //{ - // if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode)) - // { - // checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty)); - // } - //} - - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - List _lst = new List(); - var _lsCopy = new List(); - foreach (var itm in filteResult) - { - WmsHQHKanbanOutPutDetial _detail = new WmsHQHKanbanOutPutDetial( - GuidGenerator.Create(), - !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, - itm.Kanban, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1)?itm.Extend1: string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.ParentMaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty, - itm.PoLine - ,itm.Price - ,itm.Amt - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - //检验3：导入模板中看板号+物料号，不能重复 - var _isRepeatOfReportList = from arc in _lst - group arc by new { arc.Kanban, arc.MaterialCode, arc.Version } - into g - where g.Count() > 1 - select g; - foreach (var itm in _isRepeatOfReportList) - { - checkList.Add(new ErrorExportDto(version, "红旗批量出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}组合物料号{1}有重复，请检查！", itm.Key.Kanban, itm.Key.MaterialCode), string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State != 4 ).ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); - - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("红旗批量出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(entities); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs deleted file mode 100644 index 8bd8e1b6..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ /dev/null @@ -1,635 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// 红旗M平台备件-出库 - /// - - //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSHQ.Default)] - [Route("api/settleaccount/WmsHQHSharePartoutput")] - public class WmsHQHSharePartAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - private readonly WmsDapperRepository _wmsDapper; - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - public WmsHQHSharePartAppService( - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - WmsDapperRepository wmsDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _excelImportService = excelImportService; - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _wmsDapper = wmsDapper; - } - - private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) - { - //不用传version 单号能保证唯一 - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock("BJ"); - var query= from itm in entities - join itm1 in stockList on itm.MaterialCode equals itm1.SapCode -into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsHQHSharePartOutPutDetial(//少加个发货，由于零件有重复 - itm.Id, - itm.WmsBillNum, - itm.OrderBillNum, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - itm.OutPut, - itm.InPut, - itm.State, - itm.Extend1, - itm.Extend2, - itm.Version, - itm.ParentMaterialCode, - itm.BillNum, - itm.TaskId, - itm.Remark, - itm.Qty, - tm1==null?0:tm1.Qty, - itm.OutPutQty - ); - - - - - return new PagedResultDto(totalCount, query.ToList()); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartAudit(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartUpdate(WmsHQHSharePartOutPutDetial detial) - { - var _entityList= _wmsRepository.Where(p => p.Id == detial.BranchId).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutPutQty = detial.OutPutQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - - - - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut")] - public async Task WmsSharePartOutPut(WmsJitRequestDto input) - { - var _billNum = "BHQH" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - if (_list.Count() > 0) - { - var _lsAry = _list.Select(p => new - WmsHQHSharePartOutPutDetial( - GuidGenerator.Create(), - "", - string.Empty, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - p.Extend1, - p.Extend2, - input.Version, - string.Empty, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty - )); - _lst.AddRange(_lsAry.ToArray()); - } - } - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - foreach (var itm in _lst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - _version.Remark= !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - - await _wmsVersionRepository.InsertAsync(_version, true); - - } - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - - - - - - } - //return _billNum; - //else - //{ - // StringBuilder _buffer = new StringBuilder(); - // foreach (var itm in errList) - // { - // _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - // } - // var _errinfo = _buffer.ToString(); - // foreach (var job in _joblist) - // { - // job.FileName = _errinfo; - // await _job.UpdateAsync(job); - // } - - // //} - //} - //else - //{ - // _billNum = string.Empty; - //} - return ApplicationConsts.SuccessStr; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutPass(WmsJitRequestDto input) - { - if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - { - throw new BusinessException("8989", "填写过账日期应该为当月！"); - - } - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 4 ,\n" + - " @date = N'{1}'\n"+ - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString())); - } - } - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 4\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 4,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - } - return true; - } - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "BHQH" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var checkList = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - - //检验1:导入模板中的第一页签数据不能为空 - if (result == null || result.Count == 0) - { - checkList.Add(new ErrorExportDto(version, "红旗备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - //检验2:导入模板中的结算数据是否为0 - foreach (var itm in result) - { - if (itm.Qty == 0) - { - checkList.Add(new ErrorExportDto(version, "红旗备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中SAP编码{0}结算数量为０，影响出库请检查！", itm.MaterialCode), string.Empty)); - } - } - - List _lst = new List(); - - var _lsCopy = new List(); - foreach (var itm in result) - { - WmsHQHSharePartOutPutDetial _detail = new WmsHQHSharePartOutPutDetial( - GuidGenerator.Create(), - string.Empty, - string.Empty, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.MaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty - ,0 - ,itm.Qty - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - //检验3:导入模板中的SAP编号不能重复，按其汇总出库 - var _isRepeatOfReportList = _lst.GroupBy(x => new { x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _isRepeatOfReportList) - { - if (itm.Count > 1) - { - checkList.Add(new ErrorExportDto(version, "红旗备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中的SAP编码{0}有重复！", itm.MaterialCode), string.Empty)); - } - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); - - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode} - equals - new { itm2.MaterialCode} into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("H平台备件出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(entities); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - } - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs deleted file mode 100644 index 81c5750b..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ /dev/null @@ -1,655 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using SettleAccount.Job.Services; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// wms出库 - /// - //[Authorize(SettleAccountPermissions.WMSJIT.Default)] - [AllowAnonymous] - [Route("api/settleaccount/wmsjitoutput")] - - public class WMSJitAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - private readonly TaskJobService _service; - private readonly ErpPartDapperRepository _repository; - - - - /// - /// - /// - /// - /// - /// - /// - /// - public WMSJitAppService( - IExcelImportAppService excelImportService, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - - ErpPartDapperRepository repository, - TaskJobService service - - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - _repository = repository; - _service = service; - } - - - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [Authorize(SettleAccountPermissions.WMSJIT.Create)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "T" + DateTime.Now.ToString("yyyyMMddhhmmss"); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - List _lst = new List(); - var _lsCopy = new List(); - foreach (var itm in result) - { - WmsJitOutPutDetial _detail = new WmsJitOutPutDetial( - GuidGenerator.Create(), - itm.WmsBillNum, - itm.KennCode, - itm.ChassisNumber, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.ParentMaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty - ,itm.Price - ,itm.Amt - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - - - - - - var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).Select(p=>new {MaterialCode=p.MaterialCode,KennCode=p.KennCode,ChassisNumber=p.ChassisNumber,BillNum=p.BillNum ,Qty=p.Qty}) - .ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _ls1 on - new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber } - equals - new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - var checkList = new List(); - foreach (var itm in errList) - { - checkList.Add( new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - - - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - - - var query = from itm1 in _ls1 - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber } - equals - new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0 && _wmslst.Count()>0) - { - var _version = new WmsJitOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - - - - - - - - - private async Task GetCountAsync(WmsJitOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsJitOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsJitList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsJitOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - //var _ls = _repository.GetDic("WmsJitOutPut"); - //foreach (var itm in entities) - //{ - // var _first = _ls.FirstOrDefault(p => p.BillNum == itm.BillNum); - // if (_first != null) - // { - // itm.Extend = _first.OutputInfo; - - // } - //} - - - return new PagedResultDto(totalCount, entities); - } - - - - ///// - ///// 准时化出库明细 - ///// - ///// - ///// - //[HttpPost] - //[Route("Export")] - ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - //virtual public async Task ExportAsync(WmsJitOutPutDetialRequestDto input) - //{ - - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - // var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - // input.SkipCount, true); - - // IExporter _csv = new CsvExporter(); - // IExporter _excel = new ExcelExporter(); - // string _fileName = string.Empty; - // //声明导出容器 - - // byte[] result = null; - - // _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString()); - // result = await _csv.ExportAsByteArray(entities); - - // result.ShouldNotBeNull(); - - // //保存导出文件到服务器存成二进制 - // await _excelImportService.SaveBlobAsync( - // new SaveExcelImportInputDto - // { - // Name = _fileName, - // Content = result - // } - // ); - // return _fileName; - - //} - - - - - - - - - - - - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsJitDetailList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsJitOutPutDetialRequestDto input) - { - - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - //var dtoDetails = ObjectMapper.Map, List>(entities); - - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsJitOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsJitAudit(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsJitOutPutCancel")] - [DisableRequestSizeLimit] - [UnitOfWork(false)] - public async Task WmsJitCancel(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id) && p.FileName == "已确认").ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "取消确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsJitOutPut")] - public async Task WmsJitOutPut(WmsJitRequestDto input) - { - var _billNum = "T" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - var _lsCopy = new List(); - foreach (var itm in _list) - { - WmsJitOutPutDetial _detail = new WmsJitOutPutDetial( - GuidGenerator.Create(), - itm.WmsBillNum, - itm.KennCode, - itm.ChassisNumber, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - itm.Extend1, - itm.Extend2, - input.Version, - itm.ParentMaterialCode, - itm.BillNum, - GuidGenerator.Create() - ,string.Empty - ,itm.Qty - ,itm.Price - ,Math.Round(itm.Qty*itm.Price,2) - - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - } - var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).Select(p => new { MaterialCode = p.MaterialCode, KennCode = p.KennCode, ChassisNumber = p.ChassisNumber, BillNum = p.BillNum, Qty = p.Qty }) - .ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _ls1 on - new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber } - equals - new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } - select itm1; - var errList= error.GroupBy(p => new { p.BillNum }).Select(p => new {BillNum=p.Key.BillNum,Number=p.Sum(itm=>itm.Qty) }); - if (errList.Count() == 0) - { - var query = from itm1 in _ls1 - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber } - equals - new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0 && _wmslst.Count()>0) - { - var _version = new WmsJitOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty); - _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - //var _ls = new List(); - //_ls.Add(_version); - await _wmsVersionRepository.InsertAsync(_version, true); - } - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo= _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName =_errinfo; - await _job.UpdateAsync(job); - } - } - } - else - { - _billNum = string.Empty; - } - return ApplicationConsts.SuccessStr; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsJitOutPut-Pass")] - [UnitOfWork(false)] - - public async Task WmsJitOutPutPass(WmsJitRequestDto input) - { - List customConditionList = new List(); - customConditionList.Add(new CustomCondition() { Name = "BillNum", Value = input.BillNum ?? string.Empty }); - customConditionList.Add(new CustomCondition() { Name = "Date", Value = input.AccountDate.ToString() }); - var _taskid = await _service.ExportEnqueueAsync("准时化出库服务"+input.BillNum, ExportExtentsion.Excel, input.Version, string.Empty, CurrentUser, typeof(FisOutputService), customConditionList, (rs) => - { - - }); - //var sql = "DECLARE @return_value int\n" + - // "EXEC @return_value = [dbo].[p_wms_output]\n" + - // " @billnum = N'{0}',\n" + - // " @type = 0,\n" + - // " @date = N'{1}'\n"+ - // "SELECT 'Return Value' = @return_value"; - // await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - // string.Format(sql,input.BillNum,input.AccountDate.ToShortDateString()) - // ); - - - - - return true; - } - - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type =0\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsJitOutPut-Cancel")] - [UnitOfWork(false)] - [Authorize(SettleAccountPermissions.WMSJIT.Delete)] - public async Task WmsJitOutPutCancel(WmsJitRequestDto input) - { - - - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}",itm)); - } - - string str= string.Join(",",_ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 0,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql= string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - - return true; - } - - - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - var dtos = ObjectMapper.Map, List>(entities); - - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs deleted file mode 100644 index 03d56af2..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ /dev/null @@ -1,951 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// 大众看板-出库 - /// - - - [Route("api/settleaccount/wmskanbanoutput")] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - public class WMSKanbanAppService : - SettleAccountApplicationBase - { - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository1; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository1; - - private readonly KanbanUnSettledDapperRepository _dapper; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - - private readonly TaskJobService _service; - private readonly WmsDapperRepository _wmsDapper; - - // private readonly ErpPartDapperRepository _erpdapperRepository; - /// - /// - /// - /// - /// - /// - /// - /// - public WMSKanbanAppService( - - - IExcelImportAppService excelImportService, - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - KanbanUnSettledDapperRepository dapper, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - // ErpPartDapperRepository erpdapperRepository, - ICommonManager commonManager, - WmsDapperRepository wmsDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - _dapper = dapper; - // _erpdapperRepository = erpdapperRepository; - _wmsDapper = wmsDapper; - } - - private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync( WmsKanbanOutPutRequestDto input) - { - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanDetailList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsKanbanOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsKanbanAudit(List ids) - { - var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - - ///// - ///// 选择任务，生成出库单，只包含已确认的单据 - ///// - ///// - ///// - ///// - //[HttpPost] - //[Route("WmsWithOutKanbanOutPut")] - //public async Task WmsWithOutKanbanOutPut(WmsJitRequestDto input) - //{ - - // var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - // var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - // if (_joblist.Count() > 0) - // { - // var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - // List _lst = new List(); - // foreach (var filename in fileList) - // { - // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - // var _list = _excelHelper.ExcelToList(); - // foreach (var itm in _list) - // { - // var _entity= new WmsWithOutKanbanOutPutDetial( - // GuidGenerator.Create(), - // string.Empty, - // string.Empty, - // itm.MaterialCode, - // itm.MaterialDesc, - // itm.SapMaterialGroup, - // string.Empty, - // string.Empty, - // 0, - // string.Empty, - // string.Empty, - // input.Version, - // itm.SapMaterialCode, - // _billNum, - // Guid.Empty, - // string.Empty, - // itm.InvoiceQty - // ); - // _lst.Add(_entity); - // } - // } - - // var outPutDetail = await _wmsRepository1.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync(); - - // var error = from itm1 in outPutDetail - // join itm2 in _lst on - // new { itm1.MaterialCode } - // equals - // new { itm2.MaterialCode } - // select itm1; - // var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - // if (errList.Count() == 0) - // { - - // var query = from itm1 in _lst - // join itm2 in outPutDetail on - // new { itm1.MaterialCode} - // equals - // new { itm2.MaterialCode } into temp1 - // from tm1 in temp1.DefaultIfEmpty() - // where tm1 == null - // select itm1; - // var _wmslst = query.ToList(); - // foreach (var itm in _lst) - // { - // itm.BillNum = _billNum; - // } - // await _wmsRepository1.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - // int _count = _wmsVersionRepository1.Count(p => p.Version == input.Version && p.BillNum == _billNum); - // if (_count == 0) - // { - // var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - - // await _wmsVersionRepository1.InsertAsync(_version, true); - // } - - // foreach (var job in _joblist) - // { - // job.FileName = _billNum; - // await _job.UpdateAsync(job); - // } - // } - // else - // { - // StringBuilder _buffer = new StringBuilder(); - // foreach (var itm in errList) - // { - // _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - // } - // var _errinfo = _buffer.ToString(); - - // foreach (var job in _joblist) - // { - // job.FileName = _errinfo; - // await _job.UpdateAsync(job); - // } - // } - // } - // else - // { - // _billNum = string.Empty; - // } - // return ApplicationConsts.SuccessStr; ; - //} - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut")] - public async Task WmsKanbanOutPut(WmsJitRequestDto input) - { - var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - foreach (var itm in _list) - { - itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create()); - } - _lst.AddRange(_list.ToArray()); - } - // var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State!=4).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban} - equals - new { itm2.MaterialCode, itm2.Kanban } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } - equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - itm.WmsBillNum = !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : "PF"; - - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0 && _wmslst.Count()>0) - { - var _version = new WmsKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty); - _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - await _wmsVersionRepository.InsertAsync(_version, true); - } - - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - else - { - _billNum = string.Empty; - } - return ApplicationConsts.SuccessStr; ; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutPass(WmsJitRequestDto input) - { - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync(); - } - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 1,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString())); - - } - } - return true; - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 1,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - return true; - } - - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("Regenerate")] - public async Task WmsKanbanOutPutRegenerate(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - - var _lst = _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.State == 4); - - - List _detail = new List(); - foreach (var itm in _lst.ToList()) - { - - - } - - - - - await _wmsRepository.BatchDeleteAsync(); - - - - - //foreach (var itm in input.Guids) - //{ - // _ls.Add(string.Format("{0}", itm)); - //} - - //string str = string.Join(",", _ls.ToArray()); - - //var sql = "DECLARE @return_value int\n" + - // "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - // " @Guids ='{0}', \n" + - // " @billnum = N'{1}',\n" + - // " @type = 1,\n" + - // " @accountdate = N'{2}'\n" + - // "SELECT 'Return Value' = @return_value"; - - //sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - //await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - // sql - // ); - - } - return true; - } - - - - - - - - - - - - - - - - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 1\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - - - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - // 物料 物料组 物料描述 物料号 开始日期 结束日期 单位 出库数量 结算数量 寄售库存数量 - - - - //[HttpPost] - //[Route("ExcelImportWithOutKanban")] - //[DisableRequestSizeLimit] - ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - //public async Task ExcelImportWithOutKanban([FromForm] IFormFileCollection files, string version) - //{ - //var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - - - //var _list= _dapper.GetNoKanbanSettleDetail(version); - - - //var stockList = _wmsDapper.GetSalesStock(); - //var query = from itm in _list - // join itm1 in stockList on itm.MaterialCode equals itm1.SapCode - //into temp1 - // from tm1 in temp1.DefaultIfEmpty() - // select new WmsWithOutKanbanOutPutDetial( - // GuidGenerator.Create(), - // "无看板", - // itm.SapMaterialCode, - // itm.MaterialDesc, - // itm.Version, - // string.Empty, - // string.Empty, - // itm.Qty, - // tm1.Qty, - // itm.Qty, - // string.Empty, - // _billNum, - // 0, - // 0, - // itm.InvoicePrice - // ,itm.InvoiceAmt - // ); - - - //await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - //if (_count == 0) - //{ - // var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - // await _wmsVersionRepository.InsertAsync(_version, true); - //} - - - - - - - - - //var _lsCopy = new List(); - //foreach (var itm in query.ToList()) - //{ - - - // WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial( - // GuidGenerator.Create(), - // "无看板", - // itm.SapMaterialCode, - // itm.MaterialDesc, - // itm.Version, - // string.Empty, - // string.Empty, - // itm.Qty, - // itm., - // itm.Qty, - // string.Empty, - // _billNum - // ); - // _lsCopy.Add(_detail); - //} - //_lst.AddRange(_lsCopy.ToArray()); - //ExportImporter _exportImporter = new ExportImporter(); - //var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - //List _lst = new List(); - //var _lsCopy = new List(); - //foreach (var itm in result) - //{ - // WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial( - // GuidGenerator.Create(), - // !string.IsNullOrEmpty(itm.Type) ? itm.Type : string.Empty, - // itm.SapMaterialCode, - // itm.MaterialDesc, - // itm.Version, - // itm.IsBack, - // itm.Remark, - // itm.Qty, - // itm.SockQty, - // itm.OutputQty, - // itm.Extend, - // itm.BillNum - // ); - // _lsCopy.Add(_detail); - //} - //_lst.AddRange(_lsCopy.ToArray()); - - - //var outPutDetail = await _wmsRepository1.Where(p => p.Version == version).ToListAsync(); - - - //var error = from itm1 in outPutDetail - // join itm2 in _lst on - // new { itm1.SapMaterialCode } - // equals - // new { itm2.SapMaterialCode } - // select itm1; - //var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - //var checkList = new List(); - //foreach (var itm in errList) - //{ - // checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - //} - //if (checkList.Count > 0) - //{ - - // return await ExportErrorReportAsync(checkList); - //} - - - - //var query = from itm1 in _lst - // join itm2 in outPutDetail on - // new { itm1.SapMaterialCode } - // equals - // new { itm2.SapMaterialCode } into temp1 - // from tm1 in temp1.DefaultIfEmpty() - // where tm1 == null - // select itm1; - //var _wmslst = query.ToList(); - //foreach (var itm in _wmslst) - //{ - // itm.BillNum = _billNum; - //} - //await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - //if (_count == 0) - //{ - // var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - // await _wmsVersionRepository.InsertAsync(_version, true); - //} - //return _billNum; - - - - //} - - - - - - - - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var checkList = new List(); - var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss"); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - //检验1:导入模板中的第一页签数据不能为空 - if (result == null || result.Count == 0) - { - checkList.Add(new ErrorExportDto(version, "大众看板出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - //检验2:导入模板中的结算数据是否为0 - foreach (var itm in result) - { - if (itm.Qty == 0) - { - checkList.Add(new ErrorExportDto(version, "大众看板出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的结算数量为０，影响出库请检查！", itm.Kanban), string.Empty)); - } - } - - ////和物料主数据中SAP物料号检验是否存在 - //foreach (var itm in filteResult) - //{ - // if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode)) - // { - // checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty)); - // } - //} - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - //发现导入模板中存在空行，直接过滤掉 - var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.Kanban)); - - List _lst = new List(); - var _lsCopy = new List(); - foreach (var itm in filteResult) - { - WmsKanbanOutPutDetial _detail = new WmsKanbanOutPutDetial( - GuidGenerator.Create(), - !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, - itm.Kanban, - - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.MaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty, - itm.Price, - itm.Amt - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - //检验3：导入模板中看板号+物料号，不能重复 - var _isRepeatOfReportList = from arc in _lst - group arc by new { arc.Kanban, arc.MaterialCode,arc.Version } - into g - where g.Count() > 1 - select g; - foreach (var itm in _isRepeatOfReportList) - { - checkList.Add(new ErrorExportDto(version, "大众看板出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}组合物料号{1}有重复，请检查！", itm.Key.Kanban, itm.Key.MaterialCode), string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban } - equals - new { itm2.MaterialCode, itm2.Kanban } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } - equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - //return _billNum; - return ApplicationConsts.SuccessStr; - } - - - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtos = ObjectMapper.Map, List>(entities); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("大众看板出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - - - - - - - - - - - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs deleted file mode 100644 index ac754f8e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ /dev/null @@ -1,668 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - /// - /// 大众无条码看板出库单 - /// - [Route("api/settleaccount/wmskanbanoutputextend")] - //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - public class WMSKanbanExtendAppService : SettleAccountApplicationBase - { - /// - /// 大众看板-出库 - /// - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - - private readonly KanbanUnSettledDapperRepository _dapper; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - private readonly ErpPartDapperRepository _erpdapperRepository; - - - private readonly TaskJobService _service; - private readonly WmsDapperRepository _wmsDapper; - /// - /// - /// - /// - /// - /// - /// - /// - public WMSKanbanExtendAppService( - - - IExcelImportAppService excelImportService, - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - KanbanUnSettledDapperRepository dapper, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - //ErpPartDapperRepository erpdapperRepository, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - WmsDapperRepository wmsDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - _dapper = dapper; - _wmsDapper = wmsDapper; - // _erpdapperRepository = erpdapperRepository; - } - - private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutRequestDto input) - { - - - - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) - { - - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock("PLJS"); - var query = from itm in entities - join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsWithOutKanbanOutPutDetial( - GuidGenerator.Create(), - "无看板发货", - itm.SapMaterialCode, - itm.MaterialDesc, - itm.Version, - string.Empty, - string.Empty, - itm.Qty, - tm1==null?0: tm1.Qty, - itm.OutputQty, - string.Empty, - itm.BillNum, - itm.State, - itm.RealityNumber, - itm.Price, - itm.Amt - ); - - return new PagedResultDto(totalCount, entities); - } - - - - - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartUpdate(WmsWithOutKanbanOutPutDetial detial) - { - var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId && p.State != 4 ).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutputQty = detial.OutputQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - - [HttpPost] - [Route("ExcelImportWithOutKanban")] - [DisableRequestSizeLimit] - //[UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImportWithOutKanban([FromForm] IFormFileCollection files, string version) - { - var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - - - //var _list = _dapper.GetNoKanbanSettleDetail(version); - - - //var stockList = _wmsDapper.GetSalesStock(); - //var query = from itm in _list - // join itm1 in stockList on itm.MaterialCode equals itm1.SapCode - //into temp1 - // from tm1 in temp1.DefaultIfEmpty() - // select new WmsWithOutKanbanOutPutDetial( - // GuidGenerator.Create(), - // "无看板", - // itm.SapMaterialCode, - // itm.MaterialDesc, - // itm.Version, - // string.Empty, - // string.Empty, - // itm.Qty, - // tm1.Qty, - // itm.Qty, - // string.Empty, - // _billNum, - // 0, - // 0, - // itm.InvoicePrice - // , itm.InvoiceAmt - // ); - - - //await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - //if (_count == 0) - //{ - // var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - // await _wmsVersionRepository.InsertAsync(_version, true); - //} - - - - //return _billNum; - - - - - - - - //var _lsCopy = new List(); - //foreach (var itm in query.ToList()) - //{ - - - // WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial( - // GuidGenerator.Create(), - // "无看板", - // itm.SapMaterialCode, - // itm.MaterialDesc, - // itm.Version, - // string.Empty, - // string.Empty, - // itm.Qty, - // 0, - // itm.Qty, - // string.Empty, - // _billNum, - // 0, - // itm. - - // ); - // _lsCopy.Add(_detail); - //} - //_lst.AddRange(_lsCopy.ToArray()); - var checkList = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - ////和物料主数据中SAP物料号检验是否存在 - //foreach (var itm in result) - //{ - // if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode)) - // { - // checkList.Add(new ErrorExportDto(version, "大众无条码看板出库单导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty)); - // } - //} - //if (checkList.Count > 0) - //{ - // return await ExportErrorReportAsync(checkList); - //} - List _lst = new List(); - var _lsCopy = new List(); - foreach (var itm in result) - { - WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial( - GuidGenerator.Create(), - !string.IsNullOrEmpty(itm.Type) ? itm.Type : string.Empty, - itm.SapMaterialCode, - itm.MaterialDesc, - itm.Version, - itm.IsBack, - itm.Remark, - itm.Qty, - itm.SockQty, - itm.Qty, - itm.Extend, - itm.BillNum,0 - ,0, - itm.Price, - itm.Amt - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.SapMaterialCode } - equals - new { itm2.SapMaterialCode } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.SapMaterialCode } - equals - new { itm2.SapMaterialCode } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0 && _wmslst.Count()>0) - { - var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - - - - - - - - - - - - - - - - - - - - - } - - - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPutExtend")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPut(WmsJitRequestDto input) - { - - //var _count1 = _wmsVersionRepository.Count(p => p.Version == input.Version ); - //if (_count1 > 0) - //{ - // var checkList = new List(); - - // checkList.Add(new ErrorExportDto() { Message = "有重复期间数据" }); - - // if (checkList.Count > 0) - // { - - // return await ExportErrorReportAsync(checkList); - // } - //} - var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _list = _dapper.GetNoKanbanSettleDetail(input.Version); - var stockList = _wmsDapper.GetSalesStock("PLJS"); - var query = from itm in _list - join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsWithOutKanbanOutPutDetial( - GuidGenerator.Create(), - "无看板发货", - itm.SapMaterialCode, - itm.MaterialDesc, - itm.Version, - string.Empty, - string.Empty, - itm.InvoiceQty-itm.ClaimQty+itm.CP7ScrapQty, - tm1==null?0:tm1.Qty, - itm.InvoiceQty - itm.ClaimQty + itm.CP7ScrapQty, - string.Empty, - _billNum, - 0, - 0, - itm.InvoicePrice, - Math.Round(((itm.InvoiceQty - itm.ClaimQty + itm.CP7ScrapQty) * itm.InvoicePrice), 2) - ); - - - var _list1 = query.ToList().Where(p => p.Qty != 0).ToList(); - - - await _wmsRepository.GetDbContext().BulkInsertAsync(_list1, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty); - - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; ; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutPass(WmsJitRequestDto input) - { - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - // var _errorls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty(); - - - //foreach (var itm in _errorls) - //{ - // checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) }); - //} - - - - //if (checkList.Count > 0) - //{ - - // return await ExportErrorReportAsync(checkList, "校验失败.xlsx"); - //} - - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - - - - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - " EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 11,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())); - - } - } - return ApplicationConsts.SuccessStr; ; - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 11,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 11\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - return true; - } - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtos = ObjectMapper.Map, List>(entities); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("大众无条码看板出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - } - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs deleted file mode 100644 index 79ac8e05..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ /dev/null @@ -1,712 +0,0 @@ -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Repository; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.Filter; -using WY.NewJit.Extends.PaiGe.WMS; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - [Route("api/settleaccount/wmsSharePart90output")] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - public class WMSSharePart90AppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - private readonly WmsDapperRepository _wmsDapper; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - //private readonly ErpPartDapperRepository _erpdapperRepository; - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - public WMSSharePart90AppService( - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - // ErpPartDapperRepository erpdapperRepository, - WmsDapperRepository wmsDapper, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _excelImportService = excelImportService; - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _wmsDapper = wmsDapper; - // _erpdapperRepository = erpdapperRepository; - } - - private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 修改出库数量 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartUpdate(WmsSharePart90OutPutDetial detial) - { - var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutPutQty = detial.OutPutQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - var stockList = _wmsDapper.GetSalesStock("BJJS"); - var query = from itm in entities - join itm1 in stockList on itm.MaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsSharePart90OutPutDetial(//少加个发货，由于零件有重复 - itm.Id, - itm.WmsBillNum, - itm.OrderBillNum, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - itm.OutPut, - itm.InPut, - itm.State, - itm.Extend1, - itm.Extend2, - itm.Version, - itm.ParentMaterialCode, - itm.BillNum, - itm.TaskId, - itm.Remark, - itm.Qty, - tm1 == null ? 0 : tm1.Qty, - itm.OutPutQty != 0 ? itm.OutPutQty : itm.Qty, - itm.Price, - itm.Amt - ); - - - - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartAudit(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - return false; - } - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut")] - public async Task WmsSharePartOutPut(WmsJitRequestDto input) - { - var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToListOne(); - - //var _list_withbillNo = _list.Select(p => p.BillNum != string.Empty); - //var _list_withNoBillNo= _list.Select(p => p.BillNum == string.Empty); - - - if (_list.Count() > 0) - { - var _lsAry = _list.Select(p => new - WmsSharePart90OutPutDetial( - GuidGenerator.Create(), - p.WmsBillNum, - p.OrderBillNum, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty, - string.Empty, - p.Version, - p.MaterialCode, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty, - p.Price, - p.Amt - )); - _lst.AddRange(_list.ToArray()); - } - } - - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State!=4).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.OrderBillNum, itm1.WmsBillNum } - equals - new { itm2.MaterialCode, itm2.OrderBillNum, itm2.WmsBillNum } - select itm1; - - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.OrderBillNum, itm1.WmsBillNum } - equals - new { itm2.MaterialCode, itm2.OrderBillNum, itm2.WmsBillNum } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - _wmslst = _wmslst.Select(p => new - WmsSharePart90OutPutDetial( - GuidGenerator.Create(), - p.WmsBillNum, - p.OrderBillNum, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - string.Empty, - string.Empty, - input.Version, - p.MaterialCode, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty, - p.Price, - p.Amt - )).ToList(); - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_wmslst.Count() > 0 && _count == 0) - { - var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - else - { - _billNum = string.Empty; - } - return ApplicationConsts.SuccessStr; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutPass(WmsJitRequestDto input) - { - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync(); - } - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 10,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())); - - } - } - return true; - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 10,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - return true; - } - - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 10\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - - - - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var checkList = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - //检验1:导入模板中的第一页签数据不能为空 - if (result == null || result.Count == 0) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum));//过滤掉订单号为空的数据，限制这样数据导入 - //检验2:导入模板中的结算数据是否为0 - foreach (var itm in filteResult) - { - if (itm.Qty == 0) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中订单号{0}结算数量为０，影响出库请检查！", itm.OrderBillNum), string.Empty)); - } - } - - //和物料主数据中SAP物料号检验是否存在 - //foreach (var itm in filteResult) - //{ - // if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode)) - // { - // checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty)); - // } - //} - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - List _lst = new List(); - - var _lsCopy = new List(); - foreach (var itm in filteResult) - { - WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial( - GuidGenerator.Create(), - //itm.WmsBillNum, - string.Empty, - itm.OrderBillNum, - - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - string.Empty, - string.Empty, - version, - itm.ParentMaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty - , 0 - , itm.Qty, - itm.Price, - itm.Amt - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - //检验3：导入模板中订单号+物料号，不能重复 - var _isRepeatOfReportList = from arc in _lst - group arc by new { arc.OrderBillNum, arc.MaterialCode } - into g - where g.Count() > 1 - select g; - foreach (var itm in _isRepeatOfReportList) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中订单号{0}组合物料号{1}有重复，请检查！", itm.Key.OrderBillNum, itm.Key.MaterialCode), string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.OrderBillNum, itm1.MaterialCode } - equals - new {itm2.OrderBillNum, itm2.MaterialCode } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0 && _wmslst.Count() > 0) - { - var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - - private async Task CheckIsOutPut(List p_list) - { - if (p_list.Count() > 0) - { - var entity= p_list.FirstOrDefault(); - var day = entity.OrderBillNum.Right(3); - int _count = 0; - if (day == "D60") - { - _count= _wmsRepository.Count(p => p.Version == entity.Version && p.OrderBillNum.Contains("D30") && p.State!=2); - } - if (day == "D90") - { - _count = _wmsRepository.Count(p => p.Version == entity.Version && p.State != 2 && (p.OrderBillNum.Contains("D60") || p.OrderBillNum.Contains("D30"))); - } - if (_count > 0) - { - return false; - } - } - return true; - - } - - /// - ///单据列表 - /// - /// - /// - /// - [HttpPost] - [Route("GetBillList")] - [UnitOfWork(false)] - - - public async Task> GetBillList(string version) - { - var _query=_wmsRepository.Where(p => p.Version == version - && (p.OrderBillNum.Contains("D60") - || p.OrderBillNum.Contains("D30") - || p.OrderBillNum.Contains("D90"))).Select(p=>p.OrderBillNum).Distinct(); - return _query.ToList(); - - } - - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtos = ObjectMapper.Map, List>(entities); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("大众备件手工出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs deleted file mode 100644 index cfd1c9e6..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ /dev/null @@ -1,945 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - /// - /// 大众备件无单号出库单 - /// - - //[AllowAnonymous] - [Route("api/settleaccount/wmsSharePartoutput")] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - public class WMSSharePartAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository90; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository90; - - - private readonly WMSEfCoreRepository _wmsefRespository - ; - private readonly WmsDapperRepository _wmsDapper; - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - private readonly TaskJobService _service; - private readonly ErpPartDapperRepository _erpdapperRepository; - /// - /// - /// - /// - /// - /// - /// - /// - public WMSSharePartAppService( - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ErpPartDapperRepository erpdapperRepository, - ISettleAccountBranchEfCoreRepository wmsRepository90, - ISettleAccountBranchEfCoreRepository wmsVersionRepository90, - WmsDapperRepository wmsDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _excelImportService = excelImportService; - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsDapper = wmsDapper; - _wmsefRespository = wmsefRespository; - - _wmsRepository90 = wmsRepository90; - _wmsVersionRepository90 = wmsVersionRepository90; - _erpdapperRepository = erpdapperRepository; - } - - private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync( WmsSharePartOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var stockList = _wmsDapper.GetSalesStock("BJJS"); - var query = from itm in entities - join itm1 in stockList on itm.MaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsSharePartOutPutDetial(//少加个发货，由于零件有重复 - itm.Id, - itm.WmsBillNum, - itm.OrderBillNum, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - itm.OutPut, - itm.InPut, - itm.State, - itm.Extend1, - itm.Extend2, - itm.Version, - itm.ParentMaterialCode, - itm.BillNum, - itm.TaskId, - itm.Remark, - itm.Qty, - tm1 == null ? 0 : tm1.Qty, - itm.OutPutQty, - itm.Price, - itm.Amt, - itm.RealityNumber - ); - - - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, query.ToList()); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartAudit(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - return false; - } - - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut")] - public async Task WmsSharePartOutPut(WmsJitRequestDto input) - { - var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _billNoNum = "BNoBill" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List();//无订单 - List _lst90Bill = new List();//有订单 - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - - var _listSummary = _excelHelper.ExcelToListOne();//无单号 - - var _list90Summary = _excelHelper.ExcelToListOne();//有单号 - - //NoOrder用来标识采购订单号为空的数据 - var _list = _listSummary.Where(p => p.OrderBillNum == "NoOrder").ToList();//没有采购订单号的集合 - var _list90Bill = _list90Summary.Where(p => !string.IsNullOrEmpty(p.OrderBillNum) && p.OrderBillNum != "NoOrder").ToList();//有采购订单号的集合 - - - //var _list = _excelHelper.ExcelToList(); - //没有 采购订单号 - if (_list != null && _list.Count > 0) - { - var _lsAry = _list.Select(p => new - WmsSharePartOutPutDetial( - GuidGenerator.Create(), - string.Empty, - string.Empty, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty, - - string.Empty, - string.Empty, - p.MaterialCode, - _billNoNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty, - p.Price, - p.Amt, - p.RealityNumber - )); - _lst.AddRange(_list.ToArray()); - } - - if (_list90Bill != null && _list90Bill.Count() > 0) - { - var _lsAry = _list90Bill.Select(p => new - WmsSharePart90OutPutDetial( - GuidGenerator.Create(), - p.WmsBillNum, - p.OrderBillNum, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty, - - string.Empty, - string.Empty, - p.MaterialCode, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty, - p.Price, - p.Amt - )); - _lst90Bill.AddRange(_list90Bill.ToArray()); - } - } - - - if (_lst != null && _lst.Count>0) - { - //没有采购订单号 - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && string.IsNullOrEmpty(p.OrderBillNum)).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } - select itm1; - - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - _wmslst = _wmslst.Select(p => new - WmsSharePartOutPutDetial( - GuidGenerator.Create(), - string.Empty, - string.Empty, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty, - string.Empty, - input.Version, - p.MaterialCode, - _billNoNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty, - p.Price, - p.Amt,p.RealityNumber - )).ToList(); - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNoNum); - if (_wmslst.Count() > 0 && _count == 0) - { - var _version = new WmsSharePartOutPut(GuidGenerator.Create(), input.Version, _billNoNum, CurrentUser.Email,string.Empty); - _version.Remark= !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - - - await _wmsVersionRepository.InsertAsync(_version, true); - } - foreach (var job in _joblist) - { - job.FileName = _billNoNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - - - //有采购订单号 - //往Set_WmsSharePart90OutPutDetial表中存储 - if (_lst90Bill != null && _lst90Bill.Count>0) - { - //有采购订单号 - var outPutDetailBill = await _wmsRepository90.Where(p => p.Version == input.Version && !string.IsNullOrEmpty(p.OrderBillNum)).ToListAsync(); - - var error = from itm1 in outPutDetailBill - join itm2 in _lst90Bill on - new { itm1.MaterialCode, itm1.OrderBillNum } - equals - new { itm2.MaterialCode, itm2.OrderBillNum } - select itm1; - - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - var queryBill = from itm1 in _lst90Bill - join itm2 in outPutDetailBill on - new { itm1.MaterialCode, itm1.OrderBillNum } - equals - new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslstBill = queryBill.ToList(); - _wmslstBill = _wmslstBill.Select(p => new - WmsSharePart90OutPutDetial( - GuidGenerator.Create(), - p.WmsBillNum, - p.OrderBillNum, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty, - string.Empty, - input.Version, - p.MaterialCode, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty, - p.Price, - p.Amt - )).ToList(); - - await _wmsRepository90.GetDbContext().BulkInsertAsync(_wmslstBill, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository90.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_wmslstBill.Count() > 0 && _count == 0) - { - var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty); - - _version.Remark= !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty; - - await _wmsVersionRepository90.InsertAsync(_version, true); - } - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - - - } - else - { - _billNum = string.Empty; - _billNoNum = string.Empty; - } - return ApplicationConsts.SuccessStr; - } - - - - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutPass(WmsJitRequestDto input) - { - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync(); - } - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 2,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())); - - } - } - - return true; - } - - - - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - public async Task WmsSharePartUpdate(WmsSharePartOutPutDetial detial) - { - var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutPutQty = detial.OutPutQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) - { - //没有有采购单据号的单子 - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 2,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - - return true; - } - - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - //没有采购单据号的单子 - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 2\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - return true; - } - - /// - /// 出库单导入功能 - /// - /// - /// - /// - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var checkList = new List(); - ExportImporter _exportImporter = new ExportImporter(); - var result_org = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - //过滤掉隐藏的空白行20220527 - var result = result_org.Where(p => !string.IsNullOrEmpty(p.MaterialCode)).ToList(); - //检验1:导入模板中的第一页签数据不能为空 - if (result == null || result.Count == 0) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - //检验2:导入模板中的结算数据是否为0 - foreach (var itm in result) - { - if (itm.Qty == 0) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中物料号{0}结算数量为０，影响出库请检查！", itm.MaterialCode), string.Empty)); - } - } - - //和物料主数据中SAP物料号检验是否存在 - foreach (var itm in result) - { - if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode)) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty)); - } - - } - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - var result90 = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - - var result_nobill = result.Where(p =>string.IsNullOrEmpty(p.OrderBillNum)).ToList();//没有采购单号集合 - var result_withbill = result90.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum)).ToList();//有采购单号集合 - - - //没有采购单号 - if (result_nobill != null) - { - var _billNoNum = "BNoBill" + DateTime.Now.ToString("yyyyMMddhhmmss"); - List _lst = new List(); - - var _lsCopy = new List(); - var result_nobill_filter = result_nobill.Where(p => string.IsNullOrEmpty(p.OrderBillNum) && !string.IsNullOrEmpty(p.MaterialCode)); - foreach (var itm in result_nobill_filter) - { - WmsSharePartOutPutDetial _detail = new WmsSharePartOutPutDetial( - GuidGenerator.Create(), - string.Empty, - string.Empty, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - string.Empty, - version, - itm.ParentMaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty - , 0 - , itm.Qty - , itm.Price - , itm.Amt,itm.RealityNumber - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - //检验3:导入模板中的SAP编号不能重复，按其汇总出库 - var _isRepeatOfReportList = _lst.GroupBy(x => new { x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode }); - foreach (var itm in _isRepeatOfReportList) - { - if (itm.Count > 1) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中的物料编码{0}有重复！", itm.MaterialCode), string.Empty)); - } - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - //var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } - select itm1; - - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNoNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNoNum); - if (_count == 0 && _wmslst.Count() > 0) - { - var _version = new WmsSharePartOutPut(GuidGenerator.Create(), version, _billNoNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - } - - //有采购单号 - if (result_withbill != null) - { - - var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss"); - List _lst = new List(); - - var _lsCopy = new List(); - var filte_result_withbill = result_withbill.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum));//采购单号为空的过滤掉 - foreach (var itm in filte_result_withbill) - { - WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial( - GuidGenerator.Create(), - itm.WmsBillNum, - itm.OrderBillNum, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - string.Empty, - version, - itm.ParentMaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty - , 0 - , itm.Qty - , itm.Price - , itm.Amt - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - //检验3:导入模板中的订单号+物料号不能重复 - var _isRepeatOfReportList = _lst.GroupBy(x => new { x.MaterialCode,x.OrderBillNum, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode, OrderBillNum =p.Key.OrderBillNum}); - foreach (var itm in _isRepeatOfReportList) - { - if (itm.Count > 1) - { - checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中订单号{0}组合物料号{1}有重复，请检查！！",itm.OrderBillNum, itm.MaterialCode), string.Empty)); - } - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - var outPutDetail = await _wmsRepository90.Where(p => p.Version == version).ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.OrderBillNum, itm1.WmsBillNum } - equals - new { itm2.MaterialCode, itm2.OrderBillNum, itm2.WmsBillNum } - select itm1; - - - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.OrderBillNum } - equals - new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository90.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository90.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0 && _wmslst.Count() > 0) - { - var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository90.InsertAsync(_version, true); - } - } - - return ApplicationConsts.SuccessStr; - } - - - - - /// - /// 出库单导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtos = ObjectMapper.Map, List>(entities); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("大众备件出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs deleted file mode 100644 index efd4ac40..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs +++ /dev/null @@ -1,231 +0,0 @@ - -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Shouldly; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput; -using Win.Sfs.SettleAccount.Reports; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.Filter; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - /// - /// 撤销出库清单 - /// - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - [Route("api/settleaccount/WMSOutputDetailCancelDiffReport")] - public class WMSOutputDetailCancelDiffReportAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly WmsOutputSumDapperRepository _dapper; - private readonly IExcelImportAppService _excelImportService; - - private readonly ErpSumOutputDapperRepository _erpDapper; - /// - /// - /// - /// - /// - - public WMSOutputDetailCancelDiffReportAppService( - WmsOutputSumDapperRepository dapper, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ErpSumOutputDapperRepository erpDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _erpDapper = erpDapper; - _wmsRepository = wmsRepository; - _dapper = dapper; - _excelImportService = excelImportService; - - } - - [HttpGet] - [Route("Make")] - [UnitOfWork(false)] - public async Task ReportMake(string version, DateTime accountDate) - { - var _ls = _dapper.GetWmsSumCancelReportList(version, "0");//报表 - - var _count = _wmsRepository.Count(p => p.Version == version && p.State > 0); - if (_count > 0) - { - throw new BusinessException("8899", "不能重新生成此版本!"); - } - else - { - var query = _wmsRepository.Where(p => p.Version == version); - await query.BatchDeleteAsync(); - } - List _lst = new List(); - if (_ls != null && _ls.Count() > 0) - { - foreach (var itm in _ls) - { - _lst.Add(new WmsDetailCancelReport( - Guid.NewGuid(), - itm.客户, - itm.出库类型, - version, - itm.结算单, - itm.通用代码号, - itm.物料号, - itm.结算数量, - itm.实际出库数量, - itm.差异数量, - itm.物料组编码, - itm.物料组车型, - itm.物料描述, - itm.备注, - 0)); - } - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst); - return ApplicationConsts.SuccessStr; - } - /// - /// Wms汇总合计明细 - /// - /// - /// - [HttpPost] - [Route("WmsDetailReport")] - - virtual public async Task> GetListAsync(WmsRequestDetailReportDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - //客户过滤 - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - //出库类型 - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - - - private async Task GetCountAsync(WmsRequestDetailReportDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - [HttpPost] - [Route("ModifyTaskState")] - - public virtual async Task ModifyTaskState(List guids) - { - if (guids != null && guids.Count() > 0) - { - var str = "DECLARE @return_value int \n" + - "EXEC @return_value = [dbo].[p_wms_interface_cancel]\n" + - "@billnum = N'{0}', \n" + - "@type = {1}, \n" + - "@date = N'{2}', \n" + - "@switchcode = N'{3}', \n" + - "@partcode = N'{4}' \n" + - "SELECT 'Return Value' = @return_value "; - - var _ls = _wmsRepository.Where(p => guids.Contains(p.Id)); - foreach (var itm in _ls) - { - var sql = string.Format(str, itm.BillNum, itm.Type, DateTime.Now, itm.SwitchCode, itm.MaterialCode); - _wmsRepository.GetDbContext().Database.SetCommandTimeout(300); - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - } - } - //_wmsRepository.Where(p => p.BillNum ==) - return true; - } - //[HttpPost] - //[Route("Output")] - - //virtual public async Task OutputAsync(WmsRequestDetailReportDto input) - //{ - // var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - // 0, true); - // List _ls = new List(); - // if (entities.Count() > 0) - // { - // var _entity = entities.FirstOrDefault(); - // if (_entity != null) - // { - // var _version = _entity.Version; - // var _accountDate = _entity.AccountDate; - // _erpDapper.InsertWmsSum(_ls, _version, _accountDate); - // } - // } - // return true; - //} - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(WmsRequestDetailReportDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - //客户过滤 - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - //出库类型 - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - var dtoDetails = ObjectMapper.Map, List>(entities); - IExporter _excel = new ExcelExporter(); - byte[] result = null; - var _fileName = string.Format("撤销清单报表_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - result.ShouldNotBeNull(); - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs deleted file mode 100644 index 4699d824..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs +++ /dev/null @@ -1,245 +0,0 @@ - -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Shouldly; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput; -using Win.Sfs.SettleAccount.Reports; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.Filter; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - /// - /// 出库差异清单 - /// - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - [Route("api/settleaccount/WMSOutputDetailDiffReport")] - public class WMSOutputDetailDiffReportAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly WmsOutputSumDapperRepository _dapper; - private readonly IExcelImportAppService _excelImportService; - - private readonly ErpSumOutputDapperRepository _erpDapper; - /// - /// - /// - /// - /// - - public WMSOutputDetailDiffReportAppService( - WmsOutputSumDapperRepository dapper, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ErpSumOutputDapperRepository erpDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _erpDapper = erpDapper; - _wmsRepository = wmsRepository; - _dapper = dapper; - _excelImportService = excelImportService; - - } - - [HttpGet] - [Route("Make")] - [UnitOfWork(false)] - public async Task ReportMake(string version,DateTime accountDate) - { - var _ls= _dapper.GetWmsSumReportList(version,"0");//报表 - - var _count= _wmsRepository.Count(p => p.Version == version && p.State>0); - if (_count > 0) - { - throw new BusinessException("8899", "不能重新生成此版本!"); - } - else - { - var query = _wmsRepository.Where(p => p.Version == version); - await query.BatchDeleteAsync(); - } - List _lst = new List(); - if (_ls != null && _ls.Count() > 0) - { - foreach (var itm in _ls) - { - _lst.Add(new WmsDetailDiffReport( - Guid.NewGuid(), - itm.客户, - itm.出库类型, - version, - itm.结算单, - itm.通用代码号, - itm.物料号, - itm.结算数量, - itm.实际出库数量, - itm.差异数量, - itm.物料组编码, - itm.物料组车型, - itm.物料描述, - itm.备注, - 0)); - } - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst); - return ApplicationConsts.SuccessStr; - } - /// - /// Wms汇总合计明细 - /// - /// - /// - [HttpPost] - [Route("WmsDetailReport")] - - virtual public async Task> GetListAsync(WmsRequestDetailReportDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - //客户过滤 - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - //出库类型 - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - - - private async Task GetCountAsync(WmsRequestDetailReportDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - [HttpPost] - [Route("ModifyTaskState")] - - public virtual async Task ModifyTaskState(List guids) - { - if (guids != null && guids.Count() > 0) - { - var str = "DECLARE @return_value int \n" + - "EXEC @return_value = [dbo].[p_wms_interface_modify]\n" + - "@billnum = N'{0}', \n" + - "@type = {1}, \n" + - "@date = N'{2}', \n" + - "@switchcode = N'{3}', \n" + - "@partcode = N'{4}' \n" + - "SELECT 'Return Value' = @return_value "; - - var _ls= _wmsRepository.Where(p => guids.Contains(p.Id)); - foreach (var itm in _ls) - { - var sql = string.Format(str, itm.BillNum, itm.Type, DateTime.Now, itm.SwitchCode, itm.MaterialCode); - _wmsRepository.GetDbContext().Database.SetCommandTimeout(300); - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - } - } - //_wmsRepository.Where(p => p.BillNum ==) - return true; - } - //[HttpPost] - //[Route("Output")] - - //virtual public async Task OutputAsync(WmsRequestDetailReportDto input) - //{ - // var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - // 0, true); - // List _ls = new List(); - // if (entities.Count() > 0) - // { - // var _entity = entities.FirstOrDefault(); - // if (_entity != null) - // { - // var _version = _entity.Version; - // var _accountDate = _entity.AccountDate; - // _erpDapper.InsertWmsSum(_ls, _version, _accountDate); - // } - // } - // return true; - //} - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(WmsRequestDetailReportDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - //客户过滤 - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - //出库类型 - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - var dtoDetails = ObjectMapper.Map, List>(entities); - IExporter _excel = new ExcelExporter(); - byte[] result = null; - var _fileName = string.Format("差异清单报表_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - result.ShouldNotBeNull(); - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - } - - - - - - - - - - - - - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs deleted file mode 100644 index fefbdb45..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs +++ /dev/null @@ -1,544 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - /// - /// 红旗一轿手工出库单 - /// - [Route("api/settleaccount/WmsHQKBOutput")] - //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSHQ.Default)] - public class WmsHQKBOutputAppService : SettleAccountApplicationBase - { - /// - /// 大众看板-出库 - /// - //private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - //private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - - private readonly KanbanUnSettledDapperRepository _dapper; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - - private readonly TaskJobService _service; - private readonly WmsDapperRepository _wmsDapper; - - private readonly ErpPartDapperRepository _erpdapperRepository; - - /// - /// - /// - /// - /// - /// - /// - /// - public WmsHQKBOutputAppService( - - IExcelImportAppService excelImportService, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - KanbanUnSettledDapperRepository dapper, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ErpPartDapperRepository erpdapperRepository, - WmsDapperRepository wmsDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - _dapper = dapper; - _wmsDapper = wmsDapper; - _erpdapperRepository = erpdapperRepository; - } - - private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutRequestDto input) - { - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock(); - var query = from itm in entities - join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsHQWithOutKanbanOutPutDetial( - GuidGenerator.Create(), - "无看板发货", - itm.SapMaterialCode, - itm.MaterialDesc, - itm.Version, - itm.IsBack, - string.Empty, - itm.Qty, - tm1 == null ? 0 : tm1.Qty, - itm.Qty, - itm.Extend, - itm.BillNum, - itm.State, - itm.RealityNumber, - itm.Price, - itm.Amt - ); - - return new PagedResultDto(totalCount, entities); - } - - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartUpdate(WmsHQWithOutKanbanOutPutDetial detial) - { - var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutputQty = detial.OutputQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("ExcelImport")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPut([FromForm] IFormFileCollection files, string version) - { - var checkList = new List(); - //var _count1 = _wmsVersionRepository.Count(p => p.Version == version); - //if (_count1 > 0) - //{ - // var checkList = new List(); - // checkList.Add(new ErrorExportDto() { Message = "有重复期间数据" }); - // if (checkList.Count > 0) - // { - - // return await ExportErrorReportAsync(checkList); - // } - //} - - - //var _list = _dapper.GetNoKanbanSettleDetail(input.Version); - - ExportImporter _exportImporter = new ExportImporter(); - var _listOrgin = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - - if (_listOrgin == null || _listOrgin.Count == 0) - { - throw new BusinessException("导入模板数据不能为空！"); - } - //物料号不能为空,直接过滤掉,模板的中看不到有空行的情况，但是通过个IE这个插件发现有空行数据导入 - var _list = _listOrgin.Where(p =>!string.IsNullOrEmpty(p.SapMaterialCode)); - - foreach (var itm in _list) - { - if (string.IsNullOrEmpty(itm.IsBack) || string.IsNullOrEmpty(itm.Extend)) - { - checkList.Add(new ErrorExportDto(version, "红旗一轿出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中SAP编码{0}的是否备件及客户号不能为空，影响出库请检查！", itm.SapMaterialCode), string.Empty)); - } - } - - foreach (var itm in _list) - { - if (itm.IsBack != "是" && itm.IsBack != "否") - { - checkList.Add(new ErrorExportDto(version, "红旗一轿出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中SAP编码{0}的是否备件请填写是或否，影响出库请检查！", itm.SapMaterialCode), string.Empty)); - } - } - //和物料主数据中SAP物料号检验是否存在 - foreach (var itm in _list) - { - if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode)) - { - checkList.Add(new ErrorExportDto(version, "红旗一轿出库单导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty)); - } - - } - - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - //翻译一下是否备件 - foreach (var itm in _list) - { - if (itm.IsBack.Trim() == "是") - { - itm.IsBack = "1"; - } - else - { - itm.IsBack = "0"; - } - } - var getbillName = "HQVSBT";//混合数据 - if(_list.FirstOrDefault().Extend== "100113") - { - getbillName = "BT";//一轿 - } - else if(_list.FirstOrDefault().Extend == "100053") - { - getbillName = "HQKB";//红旗 - } - - var _billNum = getbillName + DateTime.Now.ToString("yyyyMMddhhmmss"); - - var stockList = _wmsDapper.GetSalesStock("PLJS"); - var query = from itm in _list - join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsHQWithOutKanbanOutPutDetial( - GuidGenerator.Create(), - "红旗一轿手工出库", - itm.SapMaterialCode, - itm.MaterialDesc, - version, - itm.IsBack,//是否备件 - string.Empty, - itm.Qty, - tm1 == null ? 0 : tm1.Qty, - itm.Qty, - itm.Extend,//存储客户信息 - _billNum, - 0, - 0, - itm.Price, - Math.Round((itm.Price * itm.Qty),2) - ); - - await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; ; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutPass(WmsJitRequestDto input) - { - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync(); - } - //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList(); - //var checkList = new List(); - - //foreach (var itm in _ls) - //{ - // checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) }); - //} - //if (checkList.Count > 0) - //{ - - // return await ExportErrorReportAsync(checkList,"校验失败.xlsx"); - //} - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_ou" + - "tput]\n" + - " @billnum = N'{0}',\n" + - " @type = 21,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())); - - } - } - return ApplicationConsts.SuccessStr; - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) - { - - //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - //{ - // throw new BusinessException("8989", "填写过账日期应该为当月！"); - - //} - - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 21,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 21\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - return true; - } - - - /// - /// 导出 - /// - /// - /// 7 - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtos = ObjectMapper.Map, List>(entities); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("红旗数据手工出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - // 物料 物料组 物料描述 物料号 期间 单位 出库数量 结算数量 - - - - - - - - } - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs deleted file mode 100644 index e05fcb17..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs +++ /dev/null @@ -1,490 +0,0 @@ -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Repository; -using Win.Sfs.Shared.Filter; -using WY.NewJit.Extends.PaiGe.WMS; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - /// - /// wms出库-M平台 - /// - - //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSHQ.Default)] - [Route("api/settleaccount/WMSHQMKanbanoutput")] - public class WmsHQMKanbanAppService : - SettleAccountApplicationBase - { - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - public WmsHQMKanbanAppService( - - - IExcelImportAppService excelImportService, - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - } - - private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsHQMKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsHQMKanbanDetailList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) - { - //不用传version 单号能保证唯一 - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsHQMKanbanOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsHQMKanbanAudit(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQMKanbanOutPut")] - public async Task WmsHQMKanbanOutPut(WmsJitRequestDto input) - { - var _billNum = "HQKBM" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - foreach (var itm in _list) - { - itm.SetData(GuidGenerator.Create(), string.Empty, !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, input.Version, GuidGenerator.Create()); - } - _lst.AddRange(_list.ToArray()); - } - - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - if (errList.Count() == 0) - { - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } - equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQMKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - - await _wmsVersionRepository.InsertAsync(_version, true); - } - - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - else - { - _billNum = string.Empty; - } - return ApplicationConsts.SuccessStr; ; - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQMKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsHQMKanbanOutPutPass(WmsJitRequestDto input) - { - if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - { - throw new BusinessException("8989", "填写过账日期应该为当月！"); - - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 7,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()) - ); - - - - return true; - - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsHQMKanbanOutPut-Cancel")] - public async Task WmsHQMKanbanOutPutCancel(WmsJitRequestDto input) - { - if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - { - throw new BusinessException("8989", "填写过账日期应该为当月！"); - - } - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 7,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 7\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "HQKBM" + DateTime.Now.ToString("yyyyMMddhhmmss"); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - List _lst = new List(); - var _lsCopy = new List(); - foreach (var itm in result) - { - WmsHQMKanbanOutPutDetial _detail = new WmsHQMKanbanOutPutDetial( - GuidGenerator.Create(), - !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, - itm.Kanban, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.MaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty, - itm.PoLine - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); - - var checkList = new List(); - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - - return await ExportErrorReportAsync(checkList); - } - - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } - equals - new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQMKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(entities); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs deleted file mode 100644 index 361baef4..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ /dev/null @@ -1,587 +0,0 @@ -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Repository; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.Filter; -using WY.NewJit.Extends.PaiGe.WMS; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - /// - /// 红旗H平台备件-出库 - /// - - [Authorize(SettleAccountPermissions.WMSHQ.Default)] - [Route("api/settleaccount/WmsHQMSharePartoutput")] - public class WmsHQMSharePartAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - private readonly WMSEfCoreRepository _wmsefRespository; - private readonly WmsDapperRepository _wmsDapper; - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - private readonly TaskJobService _service; - /// - /// - /// - /// - /// - /// - /// - /// - public WmsHQMSharePartAppService( - - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - WMSEfCoreRepository wmstbRespository, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - WmsDapperRepository wmsDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _excelImportService = excelImportService; - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _wmsDapper = wmsDapper; - } - - private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutRequestDto input) - { - - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsSharePartDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) - { - //不用传version 单号能保证唯一 - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock("BJJS"); - - - - var query = from itm in entities - join itm1 in stockList on itm.MaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsHQMSharePartOutPutDetial( - itm.Id, - itm.WmsBillNum, - itm.OrderBillNum, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - itm.OutPut, - itm.InPut, - itm.State, - itm.Extend1, - itm.Extend2, - itm.Version, - itm.ParentMaterialCode, - itm.BillNum, - itm.TaskId, - itm.Remark, - itm.Qty, - tm1 == null ? 0 : tm1.Qty - ,itm.OutPutQty - ); - - - - - return new PagedResultDto(totalCount, query.ToList()); - } - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutAudit")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartAudit(List ids) - { - var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); - foreach (var itm in _joblist) - { - itm.FileName = "已确认"; - await _job.UpdateAsync(itm); - } - - return true; - } - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut")] - public async Task WmsSharePartOutPut(WmsJitRequestDto input) - { - var _billNum = "BHQM" + DateTime.Now.ToString("yyyyMMddhhmmss"); - var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); - if (_joblist.Count() > 0) - { - var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); - List _lst = new List(); - foreach (var filename in fileList) - { - string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; - ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - var _list = _excelHelper.ExcelToList(); - if (_list.Count() > 0) - { - var _lsAry = _list.Select(p => new - WmsHQMSharePartOutPutDetial( - GuidGenerator.Create(), - "", - string.Empty, - p.MaterialCode, - p.MaterialDesc, - p.MaterialGroup, - string.Empty, - string.Empty, - 0, - p.Extend1, - p.Extend2, - input.Version, - string.Empty, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Qty, - p.StockQty, - p.Qty - - )); - _lst.AddRange(_lsAry.ToArray()); - } - } - var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - - if (errList.Count() == 0) - { - foreach (var itm in _lst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQMSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - - await _wmsVersionRepository.InsertAsync(_version, true); - - } - - foreach (var job in _joblist) - { - job.FileName = _billNum; - await _job.UpdateAsync(job); - } - } - else - { - StringBuilder _buffer = new StringBuilder(); - foreach (var itm in errList) - { - _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - } - var _errinfo = _buffer.ToString(); - - foreach (var job in _joblist) - { - job.FileName = _errinfo; - await _job.UpdateAsync(job); - } - } - } - //return _billNum; - //else - //{ - // StringBuilder _buffer = new StringBuilder(); - // foreach (var itm in errList) - // { - // _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - // } - // var _errinfo = _buffer.ToString(); - // foreach (var job in _joblist) - // { - // job.FileName = _errinfo; - // await _job.UpdateAsync(job); - // } - - // //} - //} - //else - //{ - // _billNum = string.Empty; - //} - return ApplicationConsts.SuccessStr; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsSharePartOutPutPass(WmsJitRequestDto input) - { - if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM")) - { - throw new BusinessException("8989", "填写过账日期应该为当月！"); - - } - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 8,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString())); - - } - } - return true; - } - - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartUpdate(WmsHQHSharePartOutPutDetial detial) - { - var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutPutQty = detial.OutPutQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - - - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsSharePartOutPut-Cancel")] - public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) - { - - - - - - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 8,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - } - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 8\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - - - return true; - } - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - - - - [HttpPost] - [Route("ExcelImport")] - [DisableRequestSizeLimit] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - { - var _billNum = "BHQM" + DateTime.Now.ToString("yyyyMMddhhmmss"); - ExportImporter _exportImporter = new ExportImporter(); - var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - List _lst = new List(); - - var _lsCopy = new List(); - foreach (var itm in result) - { - WmsHQMSharePartOutPutDetial _detail = new WmsHQMSharePartOutPutDetial( - GuidGenerator.Create(), - string.Empty, - string.Empty, - itm.MaterialCode, - itm.MaterialDesc, - itm.MaterialGroup, - string.Empty, - string.Empty, - 0, - !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, - !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, - version, - itm.MaterialCode, - itm.BillNum, - GuidGenerator.Create() - , string.Empty - , itm.Qty - , 0 - ,itm.Qty - ); - _lsCopy.Add(_detail); - } - _lst.AddRange(_lsCopy.ToArray()); - - - var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - var error = from itm1 in outPutDetail - join itm2 in _lst on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } - select itm1; - var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() }); - - var checkList = new List(); - foreach (var itm in errList) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - var query = from itm1 in _lst - join itm2 in outPutDetail on - new { itm1.MaterialCode } - equals - new { itm2.MaterialCode } into temp1 - from tm1 in temp1.DefaultIfEmpty() - where tm1 == null - select itm1; - var _wmslst = query.ToList(); - foreach (var itm in _wmslst) - { - itm.BillNum = _billNum; - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsHQMSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsKanbanOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(entities); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs deleted file mode 100644 index 29e2440e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs +++ /dev/null @@ -1,464 +0,0 @@ -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Repository; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.Filter; -using WY.NewJit.Extends.PaiGe.WMS; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - [Route("api/settleaccount/WmsOneTimeSaleOutput")] - //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - public class WmsOneTimeSaleOutputAppService : SettleAccountApplicationBase - { - - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; - - private readonly KanbanUnSettledDapperRepository _dapper; - private readonly WMSEfCoreRepository _wmsefRespository; - - private readonly WMSEfCoreRepository _wmstbRespository; - private readonly ISettleAccountBranchEfCoreRepository _job; - private readonly IExcelImportAppService _excelImportService; - - - private readonly TaskJobService _service; - private readonly WmsDapperRepository _wmsDapper; - private readonly ErpPartDapperRepository _erpdapperRepository; - /// - /// - /// - /// - /// - /// - /// - /// - public WmsOneTimeSaleOutputAppService( - - IExcelImportAppService excelImportService, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - ISettleAccountBranchEfCoreRepository wmsVersionRepository, - WMSEfCoreRepository wmsefRespository, - KanbanUnSettledDapperRepository dapper, - WMSEfCoreRepository wmstbRespository, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ErpPartDapperRepository erpdapperRepository, - WmsDapperRepository wmsDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - _wmstbRespository = wmstbRespository; - _wmsRepository = wmsRepository; - _wmsVersionRepository = wmsVersionRepository; - _wmsefRespository = wmsefRespository; - _excelImportService = excelImportService; - _dapper = dapper; - _wmsDapper = wmsDapper; - _erpdapperRepository = erpdapperRepository; - } - - private async Task GetCountAsync(WmsOneTimeSaleOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) - { - return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - /// - /// 准时化出库主表 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsKanbanOutPutRequestDto input) - { - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - var totalCount = await GetCountAsync(input); - - return new PagedResultDto(totalCount, entities); - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("WmsKanbanDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(WmsOneTimeSaleOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock(); - var query = from itm in entities - join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsOneTimeSaleOutPutDetial( - GuidGenerator.Create(), - "无看板发货", - itm.SapMaterialCode, - itm.MaterialDesc, - itm.Version, - itm.IsBack, - string.Empty, - itm.Qty, - tm1 == null ? 0 : tm1.Qty, - itm.Qty, - itm.Extend, - itm.BillNum, - itm.State, - itm.RealityNumber, - itm.Price, - itm.Amt - ); - - return new PagedResultDto(totalCount, entities); - } - - /// - ///更新备注 - /// - /// - /// - [HttpGet] - [Route("UpdateRemark")] - - public async Task UpdateRemark(Guid id, string remark) - { - var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id); - if (entity != null) - { - entity.Remark = remark; - await _wmsVersionRepository.UpdateAsync(entity); - - } - return true; - } - - - /// - /// 任务明细标记已确认 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - [HttpPost] - [Route("WmsSharePartOutPutModify")] - [DisableRequestSizeLimit] - - public async Task WmsSharePartUpdate(WmsOneTimeSaleOutPutDetial detial) - { - var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList(); - if (_entityList.Count() > 0) - { - foreach (var itm in _entityList) - { - itm.OutputQty = detial.OutputQty; - await _wmsRepository.UpdateAsync(itm); - } - } - return true; - - } - - /// - /// 选择任务，生成出库单，只包含已确认的单据 - /// - /// - /// - /// - [HttpPost] - [Route("ExcelImport")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPut([FromForm] IFormFileCollection files, string version) - { - var checkList = new List(); - var _billNum = "OTS" + DateTime.Now.ToString("yyyyMMddhhmmss"); - - - //var _list = _dapper.GetNoKanbanSettleDetail(input.Version); - - ExportImporter _exportImporter = new ExportImporter(); - //只取导入模板第一个页签 - var _list_org = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService); - // 根据物料号是否为空，过滤EXCEL自带的空行 - var _list = _list_org.Where(p => !string.IsNullOrEmpty(p.SapMaterialCode)); - - - //检验1:导入模板中的第一页签数据不能为空 - if (_list == null || _list.Count() == 0) - { - checkList.Add(new ErrorExportDto(version, "一次性寄售销售导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty)); - } - - //和物料主数据中SAP物料号检验是否存在 - foreach (var itm in _list) - { - if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode)) - { - checkList.Add(new ErrorExportDto(version, "一次性寄售销售导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty)); - } - - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - ////插入数据前检验 - //var checkList = new List(); - //var _group = _list.GroupBy(x => new { x.Qty,x.SapMaterialCode, x.Version }).Select(p => new { Count = p.Count(), Qty = p.Key.Qty, SapMaterialCode = p.Key.SapMaterialCode }); - //foreach (var itm in _group) - //{ - // if (itm.Qty==null) - // { - // checkList.Add(new ErrorExportDto(version, "OneTiemSale", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的，请检查！", itm.Factory), string.Empty)); - // break; - // } - //} - - - var stockList = _wmsDapper.GetSalesStock(); - var query = from itm in _list - join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode - into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new WmsOneTimeSaleOutPutDetial( - GuidGenerator.Create(), - "无看板发货", - itm.SapMaterialCode, - itm.MaterialDesc, - version, - itm.IsBack,//是否备件 - string.Empty, - itm.Qty, - tm1 == null ? 0 : tm1.Qty, - itm.Qty, - itm.Extend,//客户信息 - _billNum, - 0, - 0, - itm.Price, - itm.Amt - ); - - await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - if (_count == 0) - { - var _version = new WmsOneTimeSaleOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty); - await _wmsVersionRepository.InsertAsync(_version, true); - } - return ApplicationConsts.SuccessStr; - } - /// - /// 出库界面功能，核准出库功能 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Pass")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutPass(WmsJitRequestDto input) - { - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync(); - } - //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList(); - //var checkList = new List(); - - //foreach (var itm in _ls) - //{ - // checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) }); - //} - //if (checkList.Count > 0) - //{ - - // return await ExportErrorReportAsync(checkList,"校验失败.xlsx"); - //} - - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_ou" + - "tput]\n" + - " @billnum = N'{0}',\n" + - " @type = 22,\n" + - " @date = N'{1}'\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())); - - } - } - return ApplicationConsts.SuccessStr; - } - /// - ///出库界面功能， 撤销核准出库 - /// - /// - /// - /// - [HttpPost] - [Route("WmsKanbanOutPut-Cancel")] - [UnitOfWork(false)] - public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) - { - if (input.Guids != null && input.Guids.Count() > 0) - { - List _ls = new List(); - foreach (var itm in input.Guids) - { - _ls.Add(string.Format("{0}", itm)); - } - - string str = string.Join(",", _ls.ToArray()); - - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + - " @Guids ='{0}', \n" + - " @billnum = N'{1}',\n" + - " @type = 22,\n" + - " @accountdate = N'{2}'\n" + - "SELECT 'Return Value' = @return_value"; - - sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString()); - - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - sql - ); - - } - return true; - } - /// - /// 出库界面功能删除 - /// - /// - /// - /// - [HttpPost] - [Route("WmsOutPutDelete")] - [UnitOfWork(false)] - public async Task WmsOutPutDelete(WmsJitRequestDto input) - { - var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); - - if (count > 0) - { - return false; - } - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output_cancel_all]\n" + - " @billnum = N'{0}',\n" + - " @type = 22\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum) - ); - - return true; - } - - - /// - /// 导出 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsOneTimeSaleOutPutDetialRequestDto input) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtos = ObjectMapper.Map, List>(entities); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - - var _fileName = string.Format("一次性寄售销售出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtos); - - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - - - } - - - // 物料 物料组 物料描述 物料号 期间 单位 出库数量 结算数量 - - - - - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs deleted file mode 100644 index 52d187db..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs +++ /dev/null @@ -1,157 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using System.Text.RegularExpressions; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - public class WmsOutputSum - { - [ImporterHeader(Name = "物料号", AutoTrim = true)] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述", AutoTrim = true)] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)", AutoTrim = true)] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "单价")] - public decimal Price { set; get; } - [ImporterHeader(Name = "金额")] - public decimal Amt { set; get; } - - - } - - - - [Route("api/settleaccount/WmsOutputSum")] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - public class WmsOutputSumAppService: SettleAccountApplicationBase - { - private readonly TaskJobService _service; - private readonly IExcelImportAppService _excelImportService; - private readonly ISettleAccountBranchEfCoreRepository _job; - public WmsOutputSumAppService( - IExcelImportAppService excelImportService, - ISettleAccountBranchEfCoreRepository job, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - IDistributedCache cache - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _job = job; - - _excelImportService = excelImportService; - } - - - - - - - - - //public async Task GetWmsSum(WmsJitOutPutDetial input) - //{ - // var jobList= _job.Where(p => p.Type == input.Version).ToList(); - - // var _fileList= jobList.Where(p=>p.Name == "准时化结算核对明细" && Regex.Replace(p.FileName, @"^[A-Z]+[0-9]+$", string.Empty)==string.Empty); - - - // List _lst = new List(); - // foreach (var filename in _fileList) - // { - // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename.RealDownFileName; - // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - // var _list = _excelHelper.ExcelToList(); - // var _ls1 = _list.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - - // _ls1.GroupBy(p=>new {p.MaterialCode,p. }) - // foreach (var itm in _ls1) - // { - // var _detail = new List(); - // } - - // //var _lsCopy = new List(); - // //foreach (var itm in _list) - // //{ - // // WmsJitOutPutDetial _detail = new WmsJitOutPutDetial( - // // GuidGenerator.Create(), - // // itm.WmsBillNum, - // // itm.KennCode, - // // itm.ChassisNumber, - // // itm.MaterialCode, - // // itm.MaterialDesc, - // // itm.MaterialGroup, - // // string.Empty, - // // string.Empty, - // // 0, - // // string.Empty, - // // string.Empty, - // // input.Version, - // // itm.ParentMaterialCode, - // // itm.BillNum, - // // GuidGenerator.Create() - // // , string.Empty - // // , itm.Qty - // // ); - // // _lsCopy.Add(_detail); - // //} - // //_lst.AddRange(_lsCopy.ToArray()); - // } - //} - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs deleted file mode 100644 index ebbc1529..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs +++ /dev/null @@ -1,243 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using AutoMapper; -using System.Linq; -using System.Text; -using Volo.Abp.Guids; -using Volo.Abp.Application.Services; -using Volo.Abp.Caching; - -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.ExcelImporter; -using Win.Sfs.Shared.CacheBase; -using Win.Utils; -using Volo.Abp.Application.Dtos; -using Win.Sfs.BaseData.ImportExcelCommon; -using Volo.Abp.Domain.Repositories; -using EFCore.BulkExtensions; -using System.IO; -using Microsoft.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; -using Win.Sfs.SettleAccount.FISes; -using Win.Sfs.Shared.Enums.SettleAccount; -using Win.Sfs.Shared.Filter; -using Shouldly; -using Magicodes.ExporterAndImporter.Csv; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using System.Data.Common; -using Volo.Abp.Uow; -using Volo.Abp; -using Win.Abp.Snowflakes; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.TaskJobs; -using Magicodes.ExporterAndImporter.Core.Models; - -using TaskJob.Services; -using TaskJob.EventArgs; -using Win.Sfs.SettleAccount.Entities.WMS; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Repository; -using WY.NewJit.Extends.PaiGe.WMS; -using System.Text.RegularExpressions; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - - - - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - [Route("api/settleaccount/WmsOutputSumInterface")] - - - public class WmsOutputSumInterfaceAppService :ApplicationService - { - private readonly TaskJobService _service; - private readonly IExcelImportAppService _excelImportService; - private readonly ISettleAccountBranchEfCoreRepository _job; - - private readonly ErpSumOutputDapperRepository _dapper; - - public WmsOutputSumInterfaceAppService( - IExcelImportAppService excelImportService, - ErpSumOutputDapperRepository dapper - //ISettleAccountBranchEfCoreRepository job, - //ISnowflakeIdGenerator snowflakeIdGenerator, - //ICommonManager commonManager - - ) - { - _dapper = dapper; - - _excelImportService = excelImportService; - } - - //[HttpPost] - //[Route("ExcelImport")] - //[UnitOfWork(false)] - ////[Authorize(SettleAccountPermissions.PriceLists.Create)] - //virtual public async Task ImportAsync([FromForm] IFormFileCollection files, string version,string accountDate) - //{ - // ExportImporter _exportImporter = new ExportImporter(); - - // var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - // var _list = result.Where(p => p.实际出库数量 != 0).ToList(); - - // _dapper.InsertWmsSum(_list, version,DateTime.Parse(accountDate)); - - - // return ApplicationConsts.SuccessStr; - //} - /// - /// 准时化出库主表 - /// - /// - /// - [HttpGet] - [Route("WmsOutputList")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetListAsync(string version,string begin,string end) - { - - return _dapper.GetTask(version,begin, end); - - - } - - /// - /// 准时化出库明细 - /// - /// - /// - [HttpGet] - [Route("WmsOutputDetailList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetDetailListAsync(string taskid,string materialCode,string billnum) - { - return _dapper.GetTaskList(taskid, materialCode, billnum); - - } - - - - [HttpGet] - [Route("WmsOutputVersionList")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task> GetVersionListAsync(string taskid, string materialCode, string billnum) - { - return _dapper.GetVersionList(); - - - } - - [HttpGet] - [Route("Export")] - [UnitOfWork(false)] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(string taskid, string materialCode, string billnum) - { - var _ls=_dapper.GetTaskList(taskid, materialCode, billnum); - - IExporter _excel = new ExcelExporter(); - - - string _fileName = string.Empty; - //声明导出容器 - - - _fileName = string.Format("结算接口内容导出_{0}.xlsx", Guid.NewGuid().ToString()); - var result = await _excel.ExportAsByteArray(_ls); - - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - } - - - - - - - - - - - - - - - - //public async Task GetWmsSum(WmsJitOutPutDetial input) - //{ - // var jobList= _job.Where(p => p.Type == input.Version).ToList(); - - // var _fileList= jobList.Where(p=>p.Name == "准时化结算核对明细" && Regex.Replace(p.FileName, @"^[A-Z]+[0-9]+$", string.Empty)==string.Empty); - - - // List _lst = new List(); - // foreach (var filename in _fileList) - // { - // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename.RealDownFileName; - // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); - // var _list = _excelHelper.ExcelToList(); - // var _ls1 = _list.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); - - // _ls1.GroupBy(p=>new {p.MaterialCode,p. }) - // foreach (var itm in _ls1) - // { - // var _detail = new List(); - // } - - // //var _lsCopy = new List(); - // //foreach (var itm in _list) - // //{ - // // WmsJitOutPutDetial _detail = new WmsJitOutPutDetial( - // // GuidGenerator.Create(), - // // itm.WmsBillNum, - // // itm.KennCode, - // // itm.ChassisNumber, - // // itm.MaterialCode, - // // itm.MaterialDesc, - // // itm.MaterialGroup, - // // string.Empty, - // // string.Empty, - // // 0, - // // string.Empty, - // // string.Empty, - // // input.Version, - // // itm.ParentMaterialCode, - // // itm.BillNum, - // // GuidGenerator.Create() - // // , string.Empty - // // , itm.Qty - // // ); - // // _lsCopy.Add(_detail); - // //} - // //_lst.AddRange(_lsCopy.ToArray()); - // } - //} - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs deleted file mode 100644 index 003806c1..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs +++ /dev/null @@ -1,426 +0,0 @@ - -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Shouldly; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput; -using Win.Sfs.SettleAccount.ExportReports; -using Win.Sfs.SettleAccount.Reports; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.Filter; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - [Route("api/settleaccount/WMSOutputSumReport")] - public class WMSOutputSumReportAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly WmsOutputSumDapperRepository _dapper; - private readonly IExcelImportAppService _excelImportService; - - private readonly ErpSumOutputDapperRepository _erpDapper; - /// - /// - /// - /// - /// - - public WMSOutputSumReportAppService( - WmsOutputSumDapperRepository dapper, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ErpSumOutputDapperRepository erpDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _erpDapper = erpDapper; - _wmsRepository = wmsRepository; - _dapper = dapper; - _excelImportService=excelImportService; - - } - - [HttpGet] - [Route("Make")] - [UnitOfWork(false)] - public async Task ReportMake(string version) - { - var _ls= _dapper.GetWmsSumExtendList(version);//报表 - var _count= _wmsRepository.Count(p => p.Version == version && p.State>0); - if (_count > 0) - { - var _query= _wmsRepository.Where(p => p.State == 0 && p.Version == version); - _wmsRepository.GetDbContext().BulkDelete(_query.ToList()); - await _query.BatchDeleteAsync(); - var _query1= _wmsRepository.Where(p => p.Version == version); - var _existLst = _query1.ToList(); - - var _diffls = from itm1 in _ls - join itm2 in _existLst - on new { BillNum=itm1.结算单, MaterialCode=itm1.物料号, Pric=itm1.开票单价 } - equals new { BillNum = itm2.BillNum, MaterialCode = itm2.MaterialCode, Pric = itm2.Price } into temp1 - from tm1 in temp1.DefaultIfEmpty() where tm1 is null - select itm1; - var _difflst=_diffls.ToList(); - List _lst = new List(); - if (_difflst != null && _difflst.Count() > 0) - { - foreach (var itm in _difflst) - { - _lst.Add(new WmsDetailReport(Guid.NewGuid(), - int.Parse(itm.行号), - itm.客户, - itm.出库类型, - itm.结算编码, - itm.销售渠道, - itm.客户代码, - itm.结算单, - itm.物料号, - String.Empty, - itm.结算数量, - itm.实际出库数量, - itm.差异数量, - itm.开票单价, - itm.结算金额, - itm.已出库金额, - itm.WMS待出库金额, - itm.物料组编码, - itm.物料组车型, - itm.物料描述, - String.Empty, - 0, - version, - DateTime.MaxValue - )); - } - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst); - } - else - { - var query = _wmsRepository.Where(p => p.Version == version); - _wmsRepository.GetDbContext().BulkDelete(query.ToList()); - await query.BatchDeleteAsync(); - List _lst = new List(); - if (_ls != null && _ls.Count() > 0) - { - foreach (var itm in _ls) - { - _lst.Add(new WmsDetailReport(Guid.NewGuid(), - int.Parse(itm.行号), - itm.客户, - itm.出库类型, - itm.结算编码, - itm.销售渠道, - itm.客户代码, - itm.结算单, - itm.物料号, - String.Empty, - itm.结算数量, - itm.实际出库数量, - itm.差异数量, - itm.开票单价, - itm.结算金额, - itm.已出库金额, - itm.WMS待出库金额, - itm.物料组编码, - itm.物料组车型, - itm.物料描述, - String.Empty, - 0, - version, - DateTime.MaxValue - )); - } - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst); - } - - return ApplicationConsts.SuccessStr; - } - /// - /// Wms汇总合计明细 - /// - /// - /// - [HttpPost] - [Route("WmsDetailReport")] - - virtual public async Task> GetListAsync(WmsRequestDetailReportDto input) - { - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - - if (!string.IsNullOrEmpty(input.MaterialGroup)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup }); - } - - if (!string.IsNullOrEmpty(input.BillNum)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - } - if (input.State!=4) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() }); - } - - //20220613 新增物料号+销售渠道 - if (!string.IsNullOrEmpty(input.MaterialCode)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "MaterialCode", Logic = EnumFilterLogic.And, Value = input.MaterialCode }); - } - //20220613 新增物料号+销售渠道 - if (!string.IsNullOrEmpty(input.SaleCode)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "SaleCode", Logic = EnumFilterLogic.And, Value = input.SaleCode }); - } - - - - - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - - - /// - /// Wms汇总合计明细 - /// - /// - /// - [HttpPost] - [Route("Version")] - - virtual public async Task> GetVersionListAsync() - { - var entities = _wmsRepository.Select(p => p.Version).Distinct().ToList(); - - return entities; - } - - - private async Task GetCountAsync(WmsRequestDetailReportDto input) - { - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - - if (!string.IsNullOrEmpty(input.MaterialGroup)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup }); - } - - if (!string.IsNullOrEmpty(input.BillNum)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - } - if (input.State != 4) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() }); - } - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - - [HttpPost] - [Route("SyncSap")] - [UnitOfWork(false)] - virtual public async Task OutputAsync(WmsRequestDetailReportDto input) - { - - - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - - if (!string.IsNullOrEmpty(input.MaterialGroup)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup }); - } - - if (!string.IsNullOrEmpty(input.BillNum)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - } - //if (!string.IsNullOrEmpty(input.)) - //{ - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.BillNum }); - //} - - - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });//不能跨区间出库 - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - var checkList = new List(); - - var en1= entities.Where(p => p.OutputQty == 0).ToList(); - foreach(var itm in en1) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("结算号:{0}物料号:{1}实际出库数量为0不能同步Sap", itm.BillNum, itm.MaterialCode) }); - } - - var en2=entities.Where(p => p.OutputQty != p.Qty && p.OutputQty>0).ToList(); - foreach (var itm in en2) - { - checkList.Add(new ErrorExportDto() { Message = string.Format("结算号:{0}物料号:{1}实际出库数量不等于结算数量不能同步Sap", itm.BillNum, itm.MaterialCode) }); - } - - var _count = entities.Count(p => p.State==2); - if (_count > 1) - { - throw new BusinessException("8989", "记录中有已经完成记录!"); - - } - if (checkList.Count > 0) - { - return await ExportErrorReportAsync(checkList); - } - - - int lineNumber = 1; - foreach (var itm in entities) - { - itm.LineNumber = lineNumber; - itm.State = 2; - lineNumber++; - } - await _wmsRepository.GetDbContext().BulkUpdateAsync(entities); - - - // var count = entities.GroupBy(p => new { p.Type, p.ClientCode }).Count(); - - //if (count > 1) - // { - // throw new BusinessException("8989", "记录不在同一物料组车型、出库类型、客户编码"); - // return false; - // } - - List _ls = new List(); - if (entities.Count() > 0) - { - var _entity = entities.FirstOrDefault(); - if (_entity != null) - { - var _version = input.Version; - var _accountDate = input.AccountDate; - _erpDapper.InsertWmsSum(entities, _version, _accountDate); - } - } - return ApplicationConsts.SuccessStr; - } - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(WmsRequestDetailReportDto input) - { - if (!string.IsNullOrEmpty(input.Client)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - } - - if (!string.IsNullOrEmpty(input.Type)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - } - - if (!string.IsNullOrEmpty(input.MaterialGroup)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup }); - } - - if (!string.IsNullOrEmpty(input.BillNum)) - { - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - } - - - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - - var dtoDetails = ObjectMapper.Map, List>(entities); - - dtoDetails= dtoDetails.OrderBy( p => p.Type ).ThenBy(p=> p.BillNum).ToList(); - - IExporter _excel = new ExcelExporter(); - byte[] result = null; - var _fileName = string.Format("汇总合计报表_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - result.ShouldNotBeNull(); - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - } - - - - - - - - - - - - - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs deleted file mode 100644 index 5490749d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs +++ /dev/null @@ -1,217 +0,0 @@ -using EFCore.BulkExtensions; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; -using Win.Abp.Snowflakes; -using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.CommonManagers; -using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; -using Win.Sfs.Shared.Filter; - -namespace Win.Sfs.SettleAccount.Entities.WMS -{ - /// - /// 已结算出库查询 - /// - [Authorize(SettleAccountPermissions.WMSJIT.Default)] - [Route("api/settleaccount/WMSOutputDetailWithCodeReport")] - public class WMSOutputDetailWithCodeReportAppService : - SettleAccountApplicationBase - { - private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; - private readonly WmsOutputSumDapperRepository _dapper; - private readonly IExcelImportAppService _excelImportService; - - private readonly ErpSumOutputDapperRepository _erpDapper; - /// - /// - /// - /// - /// - - public WMSOutputDetailWithCodeReportAppService( - WmsOutputSumDapperRepository dapper, - ISettleAccountBranchEfCoreRepository wmsRepository, - ISettleAccountBranchEfCoreRepository job, - IExcelImportAppService excelImportService, - IDistributedCache cache, - ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager, - ErpSumOutputDapperRepository erpDapper - ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) - { - _erpDapper = erpDapper; - _wmsRepository = wmsRepository; - _dapper = dapper; - _excelImportService = excelImportService; - - } - - [HttpPost] - [Route("Make")] - [UnitOfWork(false)] - public async Task ReportMake(WmsDetailWithCodeDto input) - { - //先删除 - await _wmsRepository.BatchDeleteAsync(); - //有条码的业务（可根据条码/K号/底盘号，查询是否结算过，结算期间） - var _ls = _dapper.GetWmsSearchWithCodeReportList(input.cnumber, input.materialCode); - - //var _count = _wmsRepository.Count(p =>p.State > 0); - //if (_count > 0) - //{ - // throw new BusinessException("8899", "状态大于0不能生成!"); - //} - //else - //{ - // await _wmsRepository.BatchDeleteAsync(); - //} - - List _lst = new List(); - if (_ls != null && _ls.Count() > 0) - { - foreach (var itm in _ls) - { - _lst.Add(new WmsDetailWithCodeReport( - Guid.NewGuid(), - itm.客户, - itm.出库类型, - string.Empty, - itm.结算单, - itm.通用代码号, - itm.物料号, - itm.结算数量, - itm.实际出库数量, - itm.差异数量, - itm.物料组编码, - itm.物料组车型, - itm.物料描述, - itm.备注, - 0, - itm.行号, - itm.开票单价, - itm.物料组编码, - itm.结算金额 - )); - } - } - //get方法 - //if (!string.IsNullOrEmpty(input.materialCode)) - //{ - // var _org_groupList = input.materialCode.Split(new char[] { '\n' }).Distinct().ToList(); - // var _groupList = _org_groupList[0].Replace("\\n", ",").TrimEnd(','); - // if (_groupList.Count() > 0) - // { - // _lst = _lst.Where(p => _groupList.Contains(p.MaterialCode)).ToList(); - // } - //} - //post方式 - if (!string.IsNullOrEmpty(input.materialCode)) - { - var _groupList = input.materialCode.Split(new char[] { '\n' }).Distinct().ToList(); - if (_groupList.Count() > 0) - { - _lst = _lst.Where(p => _groupList.Contains(p.MaterialCode)).ToList(); - } - } - await _wmsRepository.GetDbContext().BulkInsertAsync(_lst); - return ApplicationConsts.SuccessStr; - } - /// - /// Wms汇总合计明细 - /// - /// - /// - [HttpPost] - [Route("WmsDetailReport")] - - virtual public async Task> GetListAsync(WmsRequestDetailReportDto input) - { - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - ////客户过滤 - //if (!string.IsNullOrEmpty(input.Client)) - //{ - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - //} - ////出库类型 - //if (!string.IsNullOrEmpty(input.Type)) - //{ - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - //} - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); - } - - private async Task GetCountAsync(WmsRequestDetailReportDto input) - { - return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - } - - - //private async Task GetCountAsync(WmsRequestDetailReportDto input) - //{ - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - // return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); - //} - [HttpPost] - [Route("ModifyTaskState")] - - public virtual async Task SyncInterface() - { - //_wmsRepository.Where(p => p.BillNum ==) - return true; - } - - [HttpPost] - [Route("Export")] - virtual public async Task ExportAsync(WmsRequestDetailReportDto input) - { - //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); - ////客户过滤 - //if (!string.IsNullOrEmpty(input.Client)) - //{ - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client }); - //} - ////出库类型 - //if (!string.IsNullOrEmpty(input.Type)) - //{ - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type }); - //} - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, - 0, true); - var dtoDetails = ObjectMapper.Map, List>(entities); - IExporter _excel = new ExcelExporter(); - byte[] result = null; - var _fileName = string.Format("已结算出库查询_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(dtoDetails); - result.ShouldNotBeNull(); - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs index a4d8f376..595069a9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs @@ -24,7 +24,6 @@ using Microsoft.Extensions.Configuration; using System.Reflection; using System.Text.Encodings.Web; using System.Text.Unicode; -using Win.Sfs.SettleAccount.EstimatedInventories; using OfficeOpenXml; using Win.Sfs.SettleAccount.Inventories; using Win.Sfs.SettleAccount.Entities.Errors; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index 1dd1b388..5796ad19 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -27,7 +27,6 @@ using Win.Sfs.SettleAccount.Entities.SettleAccounts; using Win.Sfs.SettleAccount.Entities.SettlementParts; using Win.Sfs.SettleAccount.Entities.TaskJobs; using Win.Sfs.SettleAccount.Entities.Wms; -using Win.Sfs.SettleAccount.Entities.WMS; using Win.Sfs.SettleAccount.FISes; using Win.Sfs.SettleAccount.Reports.ReportRequestDto; using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; 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 0db67178..db34af2d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj @@ -162,5 +162,9 @@ PreserveNewest + + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs index 6ab6d142..53d54fdf 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs @@ -3,16 +3,13 @@ using Win.Sfs.SettleAccount.EstimatedStockDiffReports; using Win.Sfs.SettleAccount.Boms; using Win.Sfs.SettleAccount.Entities.Boms; using Win.Sfs.SettleAccount.Entities.CodeSettings; -using Win.Sfs.SettleAccount.Entities.EstimatedSums; using Win.Sfs.SettleAccount.FISes; using Win.Sfs.SettleAccount.Entities.Materials; using Win.Sfs.SettleAccount.Entities.SettleAccounts; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.Inventories; using Win.Sfs.SettleAccount.Items; using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.EstimatedInventories; using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; using Win.Sfs.SettleAccount.Prebatches; @@ -27,7 +24,6 @@ using Win.Sfs.SettleAccount.Entities.StorageLocations; using Win.Sfs.SettleAccount.Entities.Inventories; using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion; using Win.Sfs.SettleAccount.Entities.Factories; -using Win.Sfs.SettleAccount.Entities.SecondaryMatching; using Win.Sfs.SettleAccount.SecondaryExportReports; using System; using Win.Sfs.SettleAccount.SupplierItemSetUps; @@ -48,22 +44,11 @@ using Win.Sfs.SettleAccount.Entities.Prices; using Win.Sfs.SettleAccount.Entities.MaterialRelationships; using Win.Sfs.SettleAccount.Entities.SettlementParts; using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef; -using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences; using Win.Sfs.SettleAccount.Entities.SettlementPartss; -using Win.Sfs.SettleAccount.Entities.SettlementCrossReference; using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartss; 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.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; -using Win.Sfs.SettleAccount.Entities.HQ_H; -using Win.Sfs.SettleAccount.Entities.WMS; using Win.Sfs.SettleAccount.Entities; using Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts; using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput; @@ -86,10 +71,8 @@ namespace Win.Sfs.SettleAccount CreateMapBom(); CreateMapBomVersion(); - CreateMapEstimatedInventoryDetail(); CreateMapInventoryDetail(); - CreateMapEstimatedSum(); CreateMapMaterial(); CreateMapMaterialRelationship(); CreateMapCodeSetting(); @@ -100,21 +83,10 @@ namespace Win.Sfs.SettleAccount CreateMapCentralizedControl(); CreateMapPrebatch(); - CreateMapEstimatedInventoryVersion(); CreateMapInventoryDetailVersion(); - CreateMapEstimatedSumVersion(); CreateMapFISVersion(); CreateMapFactory(); - - CreateMapSecondaryPriceRatio(); - CreateMapSecondaryAdjustment(); - CreateMapSecondaryDiscount(); - CreateMapSecondaryDiscountVersion(); - - - CreateMapSecondaryPriceRatioVersion(); - CreateMapSecondaryAdjustmentVersion(); CreateMapEstimatedStockDiffReport(); CreateMapSendUnsettledDiffReport(); CreateMapStockSettledDiffReport(); @@ -123,7 +95,7 @@ namespace Win.Sfs.SettleAccount CreateMapSecondaryActuralAdjustmentReport(); CreateMapSecondaryActuralDiffReport(); - CreateMapSecondaryAdjustment(); + CreateMapBTSeqKBDiffReport(); @@ -138,11 +110,6 @@ namespace Win.Sfs.SettleAccount CreateMapPriceListVersion(); CreateMapMaterialRelationshipDetail(); CreateMapMaterialRelationshipVersion(); - - CreateMapSettlementCrossReference(); - CreateMapSettlementCrossReferenceVersion(); - CreateMapSettlementPakAndSpareParts(); - CreateMapSettlementPakAndSparePartsVersion(); CreateMapSecMatchBaseDto(); CreateMapPriceListBJVersion(); @@ -155,55 +122,20 @@ namespace Win.Sfs.SettleAccount #region 派格 CreateMapInvoice(); CreateMapInvoiceVersion(); - CreateMapVWKanBan(); - CreateMapVWKanBanVersion(); - CreateMapScrapClaims(); - CreateMapScrapClaimsVersion(); - - CreateMapSparePart(); - CreateMapSparePartVersion(); CreateMapSettleAccount(); CreateMapSettleAccountVersion(); - CreateMapUnSettleAccount(); - CreateMapUnSettleAccountVersion(); - - //红旗H平台 - CreateMapHQ_H_Platform(); - CreateMapHQ_H_PlatformVersion(); - //红旗未结明细 CreateMapUnHQSettleAccount(); CreateMapUnHQSettleAccountVersion(); #endregion - #region 出库单导出 - - CreateMapWMSJit(); - CreateMapWmsKanban(); - CreateMapWMSKanbanExtend(); - CreateMapWmsSharePart(); - CreateMapWmsSharePart90(); - CreateMapWmsHQWithOutKanban(); - CreateMapWmsHQCar(); - CreateMapWmsOneTimeSale(); - CreateMapWMSOutputSum(); - CreateMapCustomerKanban(); - CreateMapWMSDiffOutputSum(); - CreateMapWMSWithCodeOutputSum(); - CreateMapWMSCacelOutputSum(); - CreateMapWMSErrorBill(); - #endregion } #region 派格出库单 - private void CreateMapCustomerKanban() - { - CreateMap().ReverseMap(); - } private void CreateMapWMSErrorBill() { CreateMap().ReverseMap(); @@ -235,80 +167,12 @@ namespace Win.Sfs.SettleAccount CreateMap().ReverseMap(); } - - private void CreateMapWMSJit() - { - CreateMap().ReverseMap(); - } - - private void CreateMapWmsKanban() - { - CreateMap().ReverseMap(); - } - - - private void CreateMapWMSKanbanExtend() - { - CreateMap().ReverseMap(); - } - - private void CreateMapWmsSharePart() - { - CreateMap().ReverseMap(); - } - - private void CreateMapWmsSharePart90() - { - CreateMap().ReverseMap(); - } - - - private void CreateMapWmsHQWithOutKanban() - { - CreateMap().ReverseMap(); - } - - private void CreateMapWmsOneTimeSale() - { - CreateMap().ReverseMap(); - } - - private void CreateMapWmsHQCar() - { - CreateMap().ReverseMap(); - } - #endregion #region PG-派格映射 - /// - /// 红旗H平台导入 - /// - private void CreateMapHQ_H_Platform() - - { - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - } - - /// - /// 红旗H平台-版本 - /// - private void CreateMapHQ_H_PlatformVersion() - - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap (); - CreateMap (); - } - + /// /// 红旗明细未结导入 @@ -335,86 +199,7 @@ namespace Win.Sfs.SettleAccount CreateMap(); } - /// - /// 大众备件发货 - /// - 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(); - } - /// - /// 大众看板导入 - /// - private void CreateMapVWKanBan() - - { - 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 CreateMapVWKanBanVersion() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } /// /// 大众发票导入 @@ -441,59 +226,6 @@ namespace Win.Sfs.SettleAccount CreateMap().ReverseMap(); } - /// - /// 报废和索赔导入 - /// - private void CreateMapScrapClaims() - - { - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - } - - /// - /// 报废和索赔导入-版本 - /// - private void CreateMapScrapClaimsVersion() - - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - - /// - /// 大众备件导入 - /// - private void CreateMapSparePart() - - { - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - } - - /// - /// 大众备件导入-版本 - /// - private void CreateMapSparePartVersion() - - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - /// /// 大众准时化结算明细导入 /// @@ -524,31 +256,6 @@ namespace Win.Sfs.SettleAccount CreateMap(); } - /// - /// 大众FIS未结算明细导入 - /// - private void CreateMapUnSettleAccount() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - /// - /// 大众FIS未结算明细导入-版本 - /// - private void CreateMapUnSettleAccountVersion() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - - #endregion #region 天合 @@ -818,28 +525,9 @@ namespace Win.Sfs.SettleAccount } - private void CreateMapEstimatedInventoryDetail() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - private void CreateMapEstimatedInventoryVersion() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - - private void CreateMapInventoryDetail() @@ -853,28 +541,6 @@ namespace Win.Sfs.SettleAccount CreateMap(); } - - - - private void CreateMapEstimatedSum() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - - private void CreateMapEstimatedSumVersion() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - private void CreateMapSupplierItemSetUp() { CreateMap().ReverseMap(); @@ -984,67 +650,6 @@ namespace Win.Sfs.SettleAccount CreateMap(); CreateMap(); } - - private void CreateMapSecondaryPriceRatio() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - private void CreateMapSecondaryAdjustment() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - - private void CreateMapSecondaryPriceRatioVersion() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - private void CreateMapSecondaryAdjustmentVersion() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - ; - CreateMap(); - CreateMap(); - } - - private void CreateMapSecondaryDiscountVersion() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - ; - CreateMap(); - CreateMap(); - } - - private void CreateMapSecondaryDiscount() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - - - - private void CreateMapSecMatchBaseDto() { CreateMap().ReverseMap(); @@ -1103,58 +708,6 @@ namespace Win.Sfs.SettleAccount CreateMap(); } - - - - - /// - /// 结算件对照表 - /// - private void CreateMapSettlementCrossReference() - { - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - } - - /// - /// 结算件对照表_Version - /// - private void CreateMapSettlementCrossReferenceVersion() - - { - - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - } - - /// - /// 结算包和散件对应关系 - /// - private void CreateMapSettlementPakAndSpareParts() - { - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - } - - /// - /// 结算包和散件对应关系_Version - /// - private void CreateMapSettlementPakAndSparePartsVersion() - - { - - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - //CreateMap().ReverseMap(); - //CreateMap().ReverseMap(); - } #endregion } } \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs deleted file mode 100644 index 7063b57a..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs +++ /dev/null @@ -1,213 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.Enums; - -namespace Win.Sfs.SettleAccount.EstimatedInventories -{ - public class EstimatedInventoryDetail : FullAuditedAggregateRootBase - { - - - [ImporterHeader(Name = "年度")] - - /// - ///年度 - /// - public string Year { get; set; } - [ImporterHeader(Name = "期间")] - - public string Period { set; get; } - - - - - /// - /// 物料凭证号（收获单号） - /// - [ImporterHeader(Name = "物料凭证号")] - - - public virtual string MaterialDocument { get; set; } - - - - /// - /// 物料凭证号（收获单号） - /// - [ImporterHeader(Name = "物料凭证行项号")] - - - public virtual string MaterialDocumentLine { get; set; } - - /// - /// 外部单号 - /// - [ImporterHeader(Name = "外部单号")] - - - public virtual string BillNumber { get; set; } - - /// - /// 记账日期（收货日期） - /// - [ImporterHeader(Name = "记账日期")] - - public virtual DateTime PostingDate { get; set; } - - - /// - /// 物料编号 - /// - [ImporterHeader(Name = "物料号")] - - public virtual string MaterialCode { get; set; } - - - - /// - /// 物料描述 - /// - - [ImporterHeader(Name = "物料描述")] - - public virtual string MaterialDesc { get; set; } - - - - - - /// - /// 收货数量 - /// - [ImporterHeader(Name = "收货数量")] - - - public virtual decimal ReceiveQty { get; set; } - - - /// - /// 发票数量 - /// - /// [ImporterHeader(Name = "描述")] - [ImporterHeader(Name = "发票数量")] - - public virtual decimal InvoiceQty { get; set; } - - /// - /// 供应商 - /// - [ImporterHeader(Name = "供应商")] - - public virtual string SupplierCode { get; set; } - - /// - /// 供应商描述 - /// - [ImporterHeader(Name = "供应商描述")] - - public virtual string SupplierDesc { get; set; } - - - /// - /// 采购凭证号 - /// - - [ImporterHeader(Name = "采购凭证号")] - - public virtual string PurchaseDocument { get; set; } - - - /// - /// 采购凭证行 - /// - [ImporterHeader(Name = "采购凭证行项")] - - public virtual string PurchaseLine { get; set; } - - - /// - /// 来源 - /// - /// - [ImporterHeader(Name = "来源")] - - public virtual string Source { get; set; } - - - - /// - /// 存储扩展字段 - /// - - public virtual Guid BranchId { get; set; } - - - - /// - /// 存储地点 - /// - [ImporterHeader(Name = "存储地点")] - - - - public string StorageLocation { get; set; } - - - - - [ImporterHeader(Name = "工厂")] - /// - /// 存储扩展字段 - /// - public string Factory { get; set; } - - - - public Guid ParentId { get; set; } - - public string Version { get; 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 EstimatedInventoryDetail() - { } - public EstimatedInventoryDetail(Guid id, - Guid branchId, string materialDocument, string billNumber, DateTime postingDate, string materialCode, string materialDesc, string storagelocation, decimal receiveQty, decimal invoiceQty, string supplierCode, string supplierDesc, string purchaseDocument, string purchaseLine, string source, string factory, string materialDocumentLine,string year, string period , Guid parentId) - { - - BranchId = branchId; - MaterialDocument = materialDocument; - BillNumber = billNumber; - PostingDate = postingDate; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - StorageLocation = storagelocation; - ReceiveQty = receiveQty; - InvoiceQty = invoiceQty; - SupplierCode = supplierCode; - SupplierDesc = supplierDesc; - PurchaseDocument = purchaseDocument; - PurchaseLine = purchaseLine; - Source = source; - Factory = factory; - MaterialDocumentLine = materialDocumentLine; - Year = year; - Period = period; - ParentId = parentId; - } - - - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs deleted file mode 100644 index 2c45c294..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Guids; -using Win.Sfs.SettleAccount.EstimatedInventories; -using Win.Sfs.Shared.DomainBase; - -namespace Win.Sfs.SettleAccount.Entities.EstimatedInventories -{ - //class EstimatedInventoryVersion - //{ - //} - - - - - public class EstimatedInventoryVersion : FullAuditedAggregateRootBase - { - - public EstimatedInventoryVersion() - { } - - 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 string Factory { private set; get; } - - - - public EstimatedInventoryVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode,string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs deleted file mode 100644 index 218d0e58..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs +++ /dev/null @@ -1,107 +0,0 @@ -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.EstimatedSums -{ - public class EstimatedSum : FullAuditedAggregateRootBase - { - /// - /// 会计年度 - /// - /// 记账期间 - /// - public string Postingperiod { set; get; } - - /// - /// 物料代码 - /// - public string MaterialCode { set; get; } - /// - /// 物料描述 - /// - public string MaterialDesc { set; get; } - - /// - /// 数量 - /// - public Decimal Qty { set; get; } - - /// - /// 供应商编码 - /// - public string SupplierCode{set;get;} - - - - /// - /// 供应商描述 - /// - public string SupplierDesc { set; get; } - - - - /// - /// - /// - public string Version { set; get; } - - - /// - ///采购订单号 - /// - public string PurchaseDocument { get; set; } - - - /// - /// 采购订单行号 - /// - public string PurchaseLine { get; set; } - - - public Guid ParentId { get; set; } - - public void SetValue(Guid id, Guid branchId, string year, string period,string version ,string supplierCode,Guid parentId) - { - - Id = id; - BranchId = branchId; - - Year = year; - Postingperiod = period; - Version = version; - - SupplierCode = supplierCode.Split(" ")[0]; - SupplierDesc =supplierCode.Split(" ")[1]; - ParentId = parentId; - } - - - public EstimatedSum() { } - public EstimatedSum( - Guid id, - Guid branchId, - - string year, string postingperiod, string materialCode, string materialDesc, decimal qty, string supplierCode, string supplierDesc,Guid parentId,string purchaseDocument,string purchaseLine) - :base(id) - { - BranchId = branchId; - Year = year; - - Postingperiod = postingperiod; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - Qty = qty; - SupplierCode = supplierCode; - SupplierDesc = supplierDesc; - PurchaseDocument = purchaseDocument; - PurchaseLine = purchaseLine; - - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs deleted file mode 100644 index 60f92e02..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Guids; -using Win.Sfs.Shared.DomainBase; - -namespace Win.Sfs.SettleAccount.Entities.EstimatedSums -{ - public class EstimatedSumVersion : FullAuditedAggregateRootBase - { - - public EstimatedSumVersion() - { } - - 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 string Factory { private set; get; } - - - public EstimatedSumVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode,string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs deleted file mode 100644 index 8fe70293..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs +++ /dev/null @@ -1,52 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -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.HQExtend -{ - public class HQKBExtend: FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - public HQKBExtend(string taskBillNum, string billNum, string materialDesc, string materialCode, decimal qty, decimal price, decimal amt, decimal tax, decimal taxAmt, decimal totalAmt) - { - TaskBillNum = taskBillNum; - BillNum = billNum; - MaterialDesc = materialDesc; - MaterialCode = materialCode; - Qty = qty; - Price = price; - Amt = amt; - Tax = tax; - TaxAmt = taxAmt; - TotalAmt = totalAmt; - } - - [ImporterHeader(Name = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ImporterHeader(Name = "采购申请单号")] - public string BillNum { get; set; } - [ImporterHeader(Name = "零件名称")] - public string MaterialDesc { get; set; } - [ImporterHeader(Name = "零件号")] - public string MaterialCode { get; set; } - [ImporterHeader(Name = "数量")] - public decimal Qty { get; set; } - [ImporterHeader(Name = "无税单价")] - public decimal Price { get; set; } - - [ImporterHeader(Name = "无税金额")] - public decimal Amt { get; set; } - [ImporterHeader(Name = "税率")] - public decimal Tax { get; set; } - [ImporterHeader(Name = "税额合计")] - public decimal TaxAmt { get; set; } - [ImporterHeader(Name = "价税合计")] - public decimal TotalAmt { get; set; } - [ImporterHeader(Name = "版本号",IsIgnore =false)] - public string Version { get ; set ; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs deleted file mode 100644 index e667ce0c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs +++ /dev/null @@ -1,55 +0,0 @@ -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.HQExtend -{ - public class HQKBExtendVersion : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - - - - - public HQKBExtendVersion() - { } - - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - - /// - /// 工厂 - /// - public string Factory { set; get; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public HQKBExtendVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode, string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs deleted file mode 100644 index 7a3f40e3..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs +++ /dev/null @@ -1,52 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -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.HQExtend -{ - public class HQKBSettleExtend : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - public HQKBSettleExtend(string taskBillNum, string billNum, string materialDesc, string materialCode, decimal qty, decimal price, decimal amt, decimal tax, decimal taxAmt, decimal totalAmt) - { - TaskBillNum = taskBillNum; - BillNum = billNum; - MaterialDesc = materialDesc; - MaterialCode = materialCode; - Qty = qty; - Price = price; - Amt = amt; - Tax = tax; - TaxAmt = taxAmt; - TotalAmt = totalAmt; - } - - [ImporterHeader(Name = "试制任务单编号")] - - public string TaskBillNum { get; set; } - [ImporterHeader(Name = "采购申请单号")] - public string BillNum { get; set; } - [ImporterHeader(Name = "零件名称")] - public string MaterialDesc { get; set; } - [ImporterHeader(Name = "零件号")] - public string MaterialCode { get; set; } - [ImporterHeader(Name = "数量")] - public decimal Qty { get; set; } - [ImporterHeader(Name = "无税单价")] - public decimal Price { get; set; } - - [ImporterHeader(Name = "无税金额")] - public decimal Amt { get; set; } - [ImporterHeader(Name = "税率")] - public decimal Tax { get; set; } - [ImporterHeader(Name = "税额合计")] - public decimal TaxAmt { get; set; } - [ImporterHeader(Name = "价税合计")] - public decimal TotalAmt { get; set; } - [ImporterHeader(Name = "版本号", IsIgnore = false)] - public string Version { get; set; } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs deleted file mode 100644 index e21f237d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs +++ /dev/null @@ -1,55 +0,0 @@ -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.HQExtend -{ - public class HQKBSettleExtendVersion : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - - - - - public HQKBSettleExtendVersion() - { } - - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - - /// - /// 工厂 - /// - public string Factory { set; get; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public HQKBSettleExtendVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode, string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs deleted file mode 100644 index f68600b1..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs +++ /dev/null @@ -1,86 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -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.HQ_F -{ - - //行号 - //零件号 - //零件中文名称 - //需求数 - //已接收数 - //订货看板编号 - //手工或自动 - //收货仓库 - //收货仓库描述 - //交货时间 - //发货状态 - //供应商 - - public class HQ_H_Kanban:FullAuditedAggregateRootBase - { - [ExporterHeader(DisplayName = "交货时间")] - public DateTime BillDate { set; get; } - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { set; get; } - [ExporterHeader(DisplayName = "行号")] - public string PoLine { set; get; } - [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { set; get; } - [ExporterHeader(DisplayName = "零件中文名称 ")] - public string MaterialDesc { set; get; } - [ExporterHeader(DisplayName = "发货数量")] - public decimal Qty { get; set; } - [ExporterHeader(DisplayName = "订货看板编号")] - public string Kanban { set; get; } - [ExporterHeader(DisplayName = "手工或自动")] - public string IsAuto { set; get; } - [ExporterHeader(DisplayName = "收货仓库")] - public string Warehouse { set; get; } - [ExporterHeader(DisplayName = "收货仓库描述 ")] - public string WarehouseDesc { set; get; } - [ExporterHeader(DisplayName = "供应商")] - public string Supplier { set; get; } - [ExporterHeader(DisplayName = "发货状态")] - public string State { set; get; } - - //public HQ_H_Kanban(DateTime billDate, string wmsBillNum, string poLine, string materialCode, string materialDesc, decimal qty, string kanban, string isAuto, string warehouse, string warehouseDesc, string supplier, string state) - //{ - // BillDate = billDate; - // WmsBillNum = wmsBillNum; - // PoLine = poLine; - // MaterialCode = materialCode; - // MaterialDesc = materialDesc; - // Qty = qty; - // Kanban = kanban; - // IsAuto = isAuto; - // Warehouse = warehouse; - // WarehouseDesc = warehouseDesc; - // Supplier = supplier; - // State = state; - //} - - public HQ_H_Kanban(Guid id, DateTime billDate, string wmsBillNum, string poLine, string materialCode, string materialDesc, decimal qty, string kanban, string isAuto, string warehouse, string warehouseDesc, string supplier, string state):base(id) - { - Id = id; - - BillDate = billDate; - WmsBillNum = wmsBillNum; - PoLine = poLine; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - Qty = qty; - Kanban = kanban; - IsAuto = isAuto; - Warehouse = warehouse; - WarehouseDesc = warehouseDesc; - Supplier = supplier; - State = state; - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs deleted file mode 100644 index 4883b898..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs +++ /dev/null @@ -1,172 +0,0 @@ -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.HQ_H -{ - public class HQ_H_Platform : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - public HQ_H_Platform() - { } - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - HQHKanBan = kanban; - } - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - } - public HQ_H_Platform(Guid Id,string materialVoucherNo,string externalKanbanNumber, - string kanbanNumber, string year,string factory,DateTime acceptanceDate, - string period, string version,string kanBan,string supplier,string storageLocation,string storageLocationDesc, - string materialCode,string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id) - { - MaterialVoucherNo = materialVoucherNo; - KanbanNumber = kanbanNumber; - ExternalKanbanNumber = externalKanbanNumber; - Year = year; - Factory = factory; - AcceptanceDate = acceptanceDate; - Period = period; - Version = version; - MaterialCode = materialCode; - HQHKanBan = kanBan; - Supplier = supplier; - StorageLocation = storageLocation; - StorageLocationDesc = storageLocationDesc; - AcceptanceNo = acceptanceNo; - Qty = qty; - Price = price; - Amt = amt; - } - - - //验收单号 外部单号 物料凭证号 物料凭证日期 物料凭证记账日期 看板编号 外部看板编号 物料号 物料描述 数量 单价 金额 - //工厂 备注 创建者 创建时间 修改人 修改时间 公司 验收单号 外部单号 发票号 会计年度 金额 计划员 存储地点 - //存储地点描述 状态 验收单日期 供应商 录入人 录入人描述 看板号 - - - - /// - ///工厂 - /// - [Display(Name = "工厂")] - public string Factory { get; set; } - /// - ///外部看板编号 - /// - [Display(Name = "外部单号")] - public string ExternalKanbanNumber { get; set; } - /// - ///看板编号 - /// - [Display(Name = "看板编号")] - public string KanbanNumber { get; set; } - /// - ///物料凭证号 - /// - [Display(Name = "物料凭证号")] - public string MaterialVoucherNo { get; set; } - - /// - ///会计年度 - /// - [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 HQHKanBan { set; get; } - - - /// - /// 物料号 - /// - [Display(Name = "物料号")] - public string MaterialCode { get; set; } - - /// - /// 验收单日期 - /// - [Display(Name = "验收单日期")] - public DateTime AcceptanceDate { get; set; } - - /// - /// 供应商 - /// - [Display(Name = "供应商")] - public string Supplier { get; set; } - - /// - /// 存储地点 - /// - [Display(Name = "存储地点")] - public string StorageLocation { get; set; } - - /// - /// 存储地点描述 - /// - [Display(Name = "存储地点描述")] - public string StorageLocationDesc { get; set; } - - /// - ///验收单号 - /// - [Display(Name = "验收单号")] - public string AcceptanceNo { get; set; } - - /// - /// 数量 - /// - [Display(Name = "数量")] - public decimal Qty { set; get; } - - /// - /// 单价 - /// - [Display(Name = "单价")] - public decimal Price { set; get; } - - /// - /// 金额 - /// - [Display(Name = "金额")] - public decimal Amt { set; get; } - - - /// - /// 备注 - /// - [Display(Name = "备注")] - public string Extend { set; get; } - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs deleted file mode 100644 index b178f157..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs +++ /dev/null @@ -1,47 +0,0 @@ -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.HQ_H -{ - public class HQ_H_PlatformVersion : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - - public HQ_H_PlatformVersion() - { } - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public HQ_H_PlatformVersion( - 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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs deleted file mode 100644 index c6ec0a1c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs +++ /dev/null @@ -1,171 +0,0 @@ -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.VWKanBan -{ - - - /* 看板条码号 - * 入库关联号 - * 工厂 - * 零件号 - * 零件类型 - * 供应商 - * R3入库日期 - * 批次 - * 入库结算标识 - * 第一文本年 - * 第一步文本号 - * 第二步文本年 - * 第二步文本号 - * R3结算时间 - * 数量 - * 结算状态 - */ - /// - /// 大众看板 - /// - public class KanBanSettle : 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; } - - /// - /// 备注 - /// - [Display(Name = "备注")] - 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 KanBanSettle() - { } - public KanBanSettle( - 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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs deleted file mode 100644 index 60660cb0..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs +++ /dev/null @@ -1,34 +0,0 @@ -using EFCore.BulkExtensions; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Domain.Services; - -namespace Win.Sfs.SettleAccount.Entities.VWKanBan -{ - public class KanBanManager:DomainService - { - private readonly ISettleAccountBranchEfCoreRepository _repository; - private readonly ISettleAccountBranchEfCoreRepository _versionRepository; - public KanBanManager( - ISettleAccountBranchEfCoreRepository repository, - ISettleAccountBranchEfCoreRepository versionRepository - - - ) - { - _versionRepository = versionRepository; - _repository = repository; - - - } - - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs deleted file mode 100644 index 1eb897cc..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Guids; -using Win.Sfs.Shared.DomainBase; - -namespace Win.Sfs.SettleAccount.Entities.VWKanBan -{ - - public class KanBanVersion : FullAuditedAggregateRootBase,ISettleAccountEntityBase - { - - public KanBanVersion() - { } - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public KanBanVersion( - 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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs deleted file mode 100644 index 0aa1f089..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs +++ /dev/null @@ -1,129 +0,0 @@ -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.SecondaryMatching -{ - public class SecondaryAdjustment : FullAuditedAggregateRootBase - { - /// - ///年度 - /// - public string Year { get; set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 客户总成物料号 - /// - public string CustomerMaterialCode { set; get; } - - /// - /// 客户组件物料号 - /// - public string CustomerComponentCode { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - - /// - /// 价格或零件号变动情况 - /// - - //[Display(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - - - - - public Guid ParentId { set; get; } - - public SecondaryAdjustment() - { } - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId, decimal qty, decimal amt, decimal total) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - ParentId = parentId; - Qty = qty; - Amt = amt; - Total = total; - } - - public SecondaryAdjustment(Guid guid, Guid branchId, string year, string period, string version, string customerMaterialCode, string customerComponentCode, string supplierCode, decimal qty, decimal amt, decimal total, string hasChanged, string buyer, Guid parentId):base(guid) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerMaterialCode = customerMaterialCode; - CustomerComponentCode = customerComponentCode; - SupplierCode = supplierCode; - Qty = qty; - Amt = amt; - Total = total; - HasChanged = hasChanged; - Buyer = buyer; - ParentId = parentId; - } - - //public SecondaryAdjustment(string year, string period, string version, string customerMaterialCode, string customerComponentCode, string supplierCode, decimal qty, decimal amt, decimal total, string remark, Guid parentId) - //{ - // Year = year; - // Period = period; - // Version = version; - // CustomerMaterialCode = customerMaterialCode; - // CustomerComponentCode = customerComponentCode; - // SupplierCode = supplierCode; - // Qty = qty; - // Amt = amt; - // Total = total; - // Remark = remark; - // ParentId = parentId; - //} - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs deleted file mode 100644 index 6714593a..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs +++ /dev/null @@ -1,53 +0,0 @@ -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.SecondaryMatching -{ - public class SecondaryAdjustmentVersion: FullAuditedAggregateRootBase - { - public SecondaryAdjustmentVersion() - { } - - 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 string Factory { private set; get; } - - - - public SecondaryAdjustmentVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode, string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - } - - - -} - diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs deleted file mode 100644 index a9140f6d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs +++ /dev/null @@ -1,116 +0,0 @@ -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.SecondaryMatching -{ - public class SecondaryDiscount : FullAuditedAggregateRootBase - { - /// - ///年度 - /// - public string Year { get; set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - public string Version { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { set; get; } - - - /// - /// 零件数量（回款） - /// - public decimal Qty { set; get; } - - /// - /// 金额（不含税） - /// - public decimal Amt { set; get; } - - /// - /// 金额（含税） - /// - public decimal Total { set; get; } - - - - /// - /// 价格或零件号变动情况 - /// - - //[Display(Name = "价格或零件号变动情况")] - public string HasChanged { get; set; } = "否"; - - - /// - /// 二配采购员 - /// - - //[Display(Name = "二配采购员")] - public string Buyer { get; set; } - - - - - - public Guid ParentId { set; get; } - - public SecondaryDiscount() - { } - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId, decimal qty, decimal amt, decimal total) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - ParentId = parentId; - Qty = qty; - Amt = amt; - Total = total; - } - - public SecondaryDiscount(Guid guid, Guid branchId, string year, string period, string version, string supplierCode, decimal qty, decimal amt, decimal total, string hasChanged, string buyer, Guid parentId):base(guid) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - SupplierCode = supplierCode; - Qty = qty; - Amt = amt; - Total = total; - HasChanged = hasChanged; - Buyer = buyer; - ParentId = parentId; - } - - //public SecondaryAdjustment(string year, string period, string version, string customerMaterialCode, string customerComponentCode, string supplierCode, decimal qty, decimal amt, decimal total, string remark, Guid parentId) - //{ - // Year = year; - // Period = period; - // Version = version; - // CustomerMaterialCode = customerMaterialCode; - // CustomerComponentCode = customerComponentCode; - // SupplierCode = supplierCode; - // Qty = qty; - // Amt = amt; - // Total = total; - // Remark = remark; - // ParentId = parentId; - //} - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs deleted file mode 100644 index 92580497..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs +++ /dev/null @@ -1,53 +0,0 @@ -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.SecondaryMatching -{ - public class SecondaryDiscountVersion : FullAuditedAggregateRootBase - { - public SecondaryDiscountVersion() - { } - - 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 string Factory { private set; get; } - - - - public SecondaryDiscountVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode, string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - } - - - -} - diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs deleted file mode 100644 index 39f47006..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs +++ /dev/null @@ -1,140 +0,0 @@ -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.SecondaryMatching -{ - public class SecondaryPriceRatio: FullAuditedAggregateRootBase - { - - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - - public string Version { set; get; } - - - - - /// - /// 客户代码 - /// - public string CustomerCode { set; get; } - - - - /// - /// 客户总成物料号 - /// - public string CustomItemCode { set; get; } - - /// - /// 客户物料号结算价格 - /// - public decimal CustomItemPrice { set; get; } - - - - /// - /// 客户组件物料号 - /// - public string CustomSubItemCode { get; set; } - - - /// - /// 客户物料号结算价格 - /// - public decimal CustomSubItemPrice { set; get; } - - - /// - /// 供应商代码 - /// - public string SupplierCode { get; set; } - /// - /// 供应商描述 - /// - public string SupplierDesc { get; set; } - - /// - /// 供货比例 - /// - public string SupplyProportion { set; get; } - - /// - /// 比例供货价格 - /// - public decimal SupplyProportionPrice { set; get; } - - - - - public Guid ParentId { set; get; } - - - - public void SetPrice(decimal supplyProportionPrice) - { - SupplyProportionPrice = supplyProportionPrice; - } - - - public void SetValue(Guid guid, Guid branchId, string year, string peroid,string version, Guid parentId,decimal supplyProportionPrice) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - ParentId = parentId; - SupplyProportionPrice = supplyProportionPrice; - - - } - - public SecondaryPriceRatio() - { } - - public SecondaryPriceRatio(Guid guid, Guid branchId, string year, string period, string version, string customerCode, string customItemCode, decimal customItemPrice, string customSubItemCode, decimal customSubItemPrice, string supplierCode, string supplierDesc, string supplyProportion, decimal supplyProportionPrice, Guid parentId) - { - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - CustomItemCode = customItemCode; - CustomItemPrice = customItemPrice; - CustomSubItemCode = customSubItemCode; - CustomSubItemPrice = customSubItemPrice; - SupplierCode = supplierCode; - SupplierDesc = supplierDesc; - SupplyProportion = supplyProportion; - SupplyProportionPrice = supplyProportionPrice; - ParentId = parentId; - } - - - - - - //public SecondaryPriceRatio(string year, string period, string erpMaterialCode, decimal erpPrice, string erpComponentCode, string erpComponentDesc, string supplierCode, string supplierDesc, string supplyProportion, decimal erpComponentPrice, decimal supplyProportionPrice, Guid parentId) - //{ - // //Year = year; - // //Period = period; - // //ErpMaterialCode = erpMaterialCode; - // //ErpPrice = erpPrice; - // //ErpComponentCode = erpComponentCode; - // //ErpComponentDesc = erpComponentDesc; - // //SupplierCode = supplierCode; - // //SupplierDesc = supplierDesc; - // //SupplyProportion = supplyProportion; - // //ErpComponentPrice = erpComponentPrice; - // //SupplyProportionPrice = supplyProportionPrice; - // //ParentId = parentId; - //} - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs deleted file mode 100644 index 82b23c8c..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs +++ /dev/null @@ -1,50 +0,0 @@ -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.SecondaryMatching -{ - public class SecondaryPriceRatioVersion : FullAuditedAggregateRootBase - { - - public SecondaryPriceRatioVersion() - { } - - public string Year { get; set; } - /// - /// 期间 - /// - public string Period { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { set; get; } - - - public string Factory { set; get; } - - - - public SecondaryPriceRatioVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode, string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs deleted file mode 100644 index 0104069a..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs -{ - public class SettledPartAndErpPartPriceDiff - { - //[ExporterHeader(DisplayName = "版本号")] - //public string Version{ set; get; } - //[ExporterHeader(DisplayName ="物料编号")] - //public string MaterialCode { set; get; } - - [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDesc { set; get; } - - [ExporterHeader(DisplayName = "ERP物料编号")] - public string ErpMaterialCode { set; get; } - [ExporterHeader(DisplayName = "总成定价")] - public decimal Price { set; get; } - [ExporterHeader(DisplayName = "Bom组成价格")] - public decimal SumPrice { get; set; } - [ExporterHeader(DisplayName = "差额")] - public decimal DiffPrice { get; set; } - } - public class PartCodeDiff - { - [ExporterHeader(DisplayName = "组成组零件")] - public string ErpMaterialCode {set;get;} - [ExporterHeader(DisplayName = "Sap零件号")] - public string MaterialCode {set;get;} - [ExporterHeader(DisplayName = "客户零件号")] - public string ShipMaterailCode {set;get;} - [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDesc {set;get;} - [ExporterHeader(DisplayName = "物料组车型")] - public string EstimateTypeDesc { set; get; } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs deleted file mode 100644 index 802fbfc2..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs +++ /dev/null @@ -1,114 +0,0 @@ -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.SettlementCrossReferences -{ - public class SettlementCrossReference : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - public SettlementCrossReference() - { } - public SettlementCrossReference(Guid Id, string year, string period, string factory, string model, string partType, string settlementMaterialCode, string bomMaterialCode, string materialDesc, string supplierCode, string supplierDesc, string buyer,string customerCode,string version) : base(Id) - { - Year = year; - Period = period; - Model = model; - Factory = factory; - PartType = partType; - SettlementMaterialCode = settlementMaterialCode; - BomMaterialCode = bomMaterialCode; - MaterialDesc = materialDesc; - SupplierCode = supplierCode; - SupplierDesc = supplierDesc; - Buyer = buyer; - CustomerCode = customerCode; - Version = version; - } - - - /// - ///年 - /// - [Display(Name = "年")] - public string Year { get; set; } - - /// - /// 期间 - /// - [Display(Name = "期间")] - public string Period { set; get; } - /// - /// 车型 - /// - [Display(Name = "车型")] - public string Model { set; get; } - /// - /// 工厂 - /// - [Display(Name = "工厂")] - public string Factory { set; get; } - - - /// - /// 零件类型 - /// - [Display(Name = "零件类型")] - public string PartType { get; set; } - - /// - /// 总成结算号 - /// - [Display(Name = "总成结算号")] - public string SettlementMaterialCode { get; set; } - - /// - /// BOM清单零件号 - /// - [Display(Name = "BOM清单零件号")] - public string BomMaterialCode { get; set; } - - /// - /// 零件名称 - /// - [Display(Name = "零件名称")] - public string MaterialDesc { get; set; } - - /// - /// 供应商代码 - /// - [Display(Name = "供应商代码")] - public string SupplierCode { set; get; } - /// - /// 供应商名称 - /// - [Display(Name = "供应商名称")] - public string SupplierDesc { set; get; } - /// - /// 采购员 - /// - [Display(Name = "采购员")] - public string Buyer { set; get; } - public string Version { get ; set ; } - /// - /// 客户号 - /// - public string CustomerCode { set; get; } - - - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string customerCode, string factory) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - CustomerCode = customerCode; - Factory = factory; - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs deleted file mode 100644 index c8e3102d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Guids; -using Win.Sfs.Shared.DomainBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReference -{ - - public class SettlementCrossReferenceVersion : FullAuditedAggregateRootBase,ISettleAccountEntityBase - { - - public SettlementCrossReferenceVersion() - { } - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public string Factory { private set; get; } - public SettlementCrossReferenceVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode,string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs deleted file mode 100644 index ac6e7cb1..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs +++ /dev/null @@ -1,227 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using Win.Sfs.Shared.DomainBase; - -using Win.Sfs.Shared.Constant; - -namespace Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef -{ - /// - /// 结算包跟散件对应关系 - /// - public class SettlementPakAndSpareParts : FullAuditedAggregateRootBase - { - private string empty1; - private string empty2; - private string settleCode; - private string v1; - private string v2; - private string empty3; - private string v3; - private string v4; - private string v5; - private string v6; - private string v7; - private int v8; - private decimal v9; - private string v10; - private decimal v11; - private string partDesc; - private string partcode; - private string productType; - private decimal carNumber; - private string v; - private decimal carPrice; - - /// - /// 分支id - /// - [Display(Name = "分支Id")] - - public Guid BranchId { get; set; } - - /// - /// 期间 - /// - [Display(Name = "期间")] - public string Period { set; get; } - - - /// - /// 适用功能 - /// - [Display(Name = "适用功能")] - public string ApplicableFunction { get; protected set; } - - - /// - /// 结算件编码 - /// - [Display(Name = "结算件编码")] - [Required(ErrorMessage = "{0}是必填项")] - public string SettlementPartCode { get; set; } - - - /// - /// 结算件描述 - /// - [Display(Name = "结算件描述")] - [MaxLength(CommonConsts.MaxDescriptionLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string SettlementPartDesc { get; set; } - - - /// - /// (Erp散件)零件号 - /// - [Display(Name = "(Erp散件)零件号")] - public string ErpSparePartCode { get; set; } - - - /// - /// (Erp散件)零件名称 - /// - [Display(Name = "(Erp散件)零件名称")] - public string ErpSparePartName { get; set; } - - - /// - /// 零件类型 - /// - [Display(Name = "零件类型")] - public string PartType { set; get; } - - - /// - /// QAD代码 - /// - [Display(Name = "QAD代码")] - public string QADCode { set; get; } - - - /// - /// 供应商代码 - /// - [Display(Name = "供应商代码")] - public string SupplierCode { set; get; } - - - /// - /// 供应商名称 - /// - [Display(Name = "供应商名称")] - public string SupplierName { set; get; } - - - /// - /// 产品类 - /// - [Display(Name = "产品类")] - public string ProductLine { get; internal set; } - - - /// - /// 每车数量 - /// - [Display(Name = "每车数量")] - public decimal PerCarNum { get; set; } - - - /// - /// 单价 - /// - [Display(Name = "单价")] - public decimal Price { get; set; } - - - /// - /// 供货比例 - /// - [Display(Name = "供货比例")] - public string SupplyProportion { get; set; } - - - /// - /// 辆份价格 - /// - [Display(Name = "辆份价格")] - public decimal QuantityPrice { get; set; } - [Display(Name = "版本")] - public string Version { get; set; } - [Display(Name = "客户编码")] - public string CustomerCode { get; set; } - [Display(Name = "车型")] - public string Model { get; set; } - - - public SettlementPakAndSpareParts() - { - } - - public SettlementPakAndSpareParts(Guid id, string period, string applicableFunction, string settlementPartCode, string settlementPartDesc, - string erpSparePartCode, string erpSparePartName, string partType, string qadCode, string supplierCode, string supplierName, string productLine, - decimal perCarNum, decimal price, string supplyProportion, decimal quantityPrice,string version,string customerCode,string model):base(id) - { - - Period = period; - ApplicableFunction = applicableFunction; - SettlementPartCode = settlementPartCode; - SettlementPartDesc = settlementPartDesc; - ErpSparePartCode = erpSparePartCode; - ErpSparePartName = erpSparePartName; - PartType = partType; - QADCode = qadCode; - SupplierCode = supplierCode; - SupplierName = supplierName; - ProductLine = productLine; - PerCarNum = perCarNum; - Price = price; - SupplyProportion = supplyProportion; - QuantityPrice = quantityPrice; - Version = version; - CustomerCode = customerCode; - Model = model; - } - - public SettlementPakAndSpareParts(Guid id, string empty1, string empty2, string settleCode, string v1, string v2, string empty3, string v3, string v4, string v5, string v6, string v7, int v8, decimal v9, string v10, decimal v11, string version, string customerCode) : base(id) - { - this.empty1 = empty1; - this.empty2 = empty2; - this.settleCode = settleCode; - this.v1 = v1; - this.v2 = v2; - this.empty3 = empty3; - this.v3 = v3; - this.v4 = v4; - this.v5 = v5; - this.v6 = v6; - this.v7 = v7; - this.v8 = v8; - this.v9 = v9; - this.v10 = v10; - this.v11 = v11; - Version = version; - CustomerCode = customerCode; - } - - public SettlementPakAndSpareParts(Guid id, string empty1, string empty2, string settleCode, string partDesc, string partcode, string empty3, string partType, string qadCode, string supplierCode, string supplierName, string productType, decimal carNumber, decimal price, string v, decimal carPrice, string version, string customerCode) : base(id) - { - this.empty1 = empty1; - this.empty2 = empty2; - this.settleCode = settleCode; - this.partDesc = partDesc; - this.partcode = partcode; - this.empty3 = empty3; - PartType = partType; - QADCode = qadCode; - SupplierCode = supplierCode; - SupplierName = supplierName; - this.productType = productType; - this.carNumber = carNumber; - Price = price; - this.v = v; - this.carPrice = carPrice; - Version = version; - CustomerCode = customerCode; - } - } -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs deleted file mode 100644 index 50deb1b9..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Guids; -using Win.Sfs.Shared.DomainBase; - -namespace Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef -{ - - public class SettlementPakAndSparePartsVersion : FullAuditedAggregateRootBase,ISettleAccountEntityBase - { - - public SettlementPakAndSparePartsVersion() - { } - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public string Factory { private set; get; } - public SettlementPakAndSparePartsVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode,string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs deleted file mode 100644 index 9b48cbf2..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs +++ /dev/null @@ -1,128 +0,0 @@ -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.SettleAccounts -{ - /// - /// 大众FIS未结算明细导入 - /// - public class UnSettleAccount: FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - - - /// - ///年度 - /// - public string Year { get; protected set; } - - /// - /// 期间 - /// - public string Period { set; get; } - - - - /// - /// 年份 - /// - public string SettleYear { set; get; } - /// - /// KENEN号 - /// - public string KENNCode { set; get; } - /// - /// 底盘号 - /// - public string ChassisNumber { set; get; } - /// - /// 车型 - /// - public string Model { set; get; } - /// - /// CP5A日期 - /// - public DateTime CP5A { set; get; } - /// - /// CP7日期,可空 - /// - public DateTime? CP7 { set; get; } - - /// - /// 零件号 - /// - public string MaterialCode { get; protected set; } - /// - /// 数量 - /// - public decimal Qty { get; protected set; } - /// - /// 结算标识 - /// - - public string SettlementID { get; protected set; } - - /// - /// 结算供应商 - /// - public string SettlementSupplier { get; protected set; } - - - - public Guid ParentId { get; protected set; } - - - - - /// - /// 状态 - /// - public int state { get; set; } - - /// - /// 未结算原因 - /// - public string UnsettledReason { get; set; } - - public string Version { set; get; } - 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 UnSettleAccount() - { } - public UnSettleAccount( - Guid id, - Guid branchId, - string year, string kENNCode, string chassisNumber, string model, DateTime cP5A, DateTime? cP7, string materialCode, decimal qty, string settlementID, string settlementSupplier, string period,string settleYear, Guid parentId,string version , DateTime creationTime, Guid guid,string reason) :base(id) - { - BranchId = branchId; - Year = year; - KENNCode = kENNCode; - ChassisNumber = chassisNumber; - Model = model; - CP5A = cP5A; - CP7 = cP7; - MaterialCode = materialCode; - Qty = qty; - SettlementID = settlementID; - SettlementSupplier = settlementSupplier; - Version = version; - Period = period; - SettleYear = settleYear; - ParentId = parentId; - CreationTime = creationTime; - CreatorId = guid; - UnsettledReason = reason; - - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs deleted file mode 100644 index f13d0ccc..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Guids; -using Win.Sfs.Shared.DomainBase; - -namespace Win.Sfs.SettleAccount.Entities.SettleAccounts -{ - - public class UnSettleAccountVersion : FullAuditedAggregateRootBase,ISettleAccountEntityBase - { - - public UnSettleAccountVersion() - { } - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public string Factory { private set; get; } - public UnSettleAccountVersion( - Guid id, - Guid branchId, - string year, string period, string version, string customerCode,string factory) : base(id) - { - BranchId = branchId; - Year = year; - Period = period; - Version = version; - CustomerCode = customerCode; - Factory = factory; - - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs deleted file mode 100644 index 78332181..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs +++ /dev/null @@ -1,101 +0,0 @@ -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.VWScrapClaims -{ - /// - /// CP7报废和索赔 - /// - public class ScrapClaims : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - public ScrapClaims() - { } - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - } - public ScrapClaims(Guid Id, string year, string period, string version,string type, - string materialCode, string materialDesc, decimal qty, - decimal amt) : base(Id) - { - Year = year; - Period = period; - Version = version; - Type = type; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - Qty = qty; - Amt = amt; - } - - //类型 零件号 零件名称 数 量 金 额 - - /// - ///年 - /// - [Display(Name = "年")] - public string Year { get; set; } - /// - /// 期间 - /// - [Display(Name = "期间")] - public string Period { set; get; } - /// - /// 版本号 - /// - [Display(Name = "版本号")] - public string Version { set; get; } - /// - /// 类型：CP7报废和索赔两种 - /// - [Display(Name = "类型")] - public string Type { set; get; } - - - /// - /// 零件号 - /// - [Display(Name = "零件号")] - public string MaterialCode { get; set; } - - /// - /// 零件名称 - /// - [Display(Name = "零件名称")] - public string MaterialDesc { get; set; } - - - - /// - /// 数量 - /// - [Display(Name = "数量")] - public decimal Qty { set; get; } - - /// - /// 金额 - /// - [Display(Name = "金额")] - public decimal Amt { set; get; } - - - /// - /// 备注 - /// - [Display(Name = "备注")] - public string Extend { set; get; } - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs deleted file mode 100644 index 2015dfbe..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs +++ /dev/null @@ -1,47 +0,0 @@ -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.VWScrapClaims -{ - public class ScrapClaimsVersion : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - - public ScrapClaimsVersion() - { } - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public ScrapClaimsVersion( - 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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs deleted file mode 100644 index cae54b14..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs +++ /dev/null @@ -1,215 +0,0 @@ -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.VWSparePart -{ - /// - /// 大众备件 - /// - public class SparePart : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - public SparePart() - { } - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string extend) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - Extend = extend; - } - - public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, string extend,string purchaseOrderNo) - { - Period = peroid; - Year = year; - Id = guid; - Version = version; - BranchId = branchId; - Extend = extend; - PurchaseOrderNo = purchaseOrderNo; - } - public SparePart(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; } - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs deleted file mode 100644 index ed1757cb..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs +++ /dev/null @@ -1,47 +0,0 @@ -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.VWSparePart -{ - public class SparePartVersion : FullAuditedAggregateRootBase, ISettleAccountEntityBase - { - - public SparePartVersion() - { } - - public string Year { get; private set; } - /// - /// 期间 - /// - public string Period { get; private set; } - /// - /// 版本号 - /// - public string Version { get; set; } - - /// - /// 客户号 - /// - public string CustomerCode { private set; get; } - - - public SparePartVersion( - 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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs deleted file mode 100644 index 169d875e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs +++ /dev/null @@ -1,31 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs deleted file mode 100644 index 0be2eae0..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs +++ /dev/null @@ -1,254 +0,0 @@ -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 Guid Id { set; get; } - /// - /// 版本 - /// - public string Version { set; get; } - /// - /// 看板条码号 - /// - public string Kanban { set; get; } - - /// - /// 入库关联号 - /// - - public string Relation { set; get; } - /// - /// 零件号 - /// - public string MaterialCode { set; get; } - /// - /// 零件类型 - /// - public string PartType { set; get; } - - - /// - /// WMS交货单 - /// - public string WMSDeliveryNote { set; get; } - - /// - /// WMS实际发货日期 - /// - public DateTime WMSActualGoodsDate { set; get; } - - /// - /// WMS交货数量 - /// - public decimal WMSDeliveryQty { set; get; } - - /// - /// 出库单号 - /// - public string DeliveryOrderNo { set; get; } - - - - public void SetValue(Guid guid, string version) - { - Id = guid; - Version = version; - } - public WMSKanBanSettle() - { } - public WMSKanBanSettle( - Guid id, - Guid branchId, - string version, - string kanban, - string relation, - string materialCode, - string partType, - Guid guid) : base(id) - { - BranchId = branchId; - Version = version; - Kanban = kanban; - Relation = relation; - MaterialCode = materialCode; - PartType = partType; - CreatorId = guid; - } - - - - - - } - //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 WMSActualGoodsDate { set; get; } - - // /// - // /// WMS交货数量 - // /// - // public decimal WMSDeliveryQty { set; get; } - - // /// - // /// WMS发货状态 - // /// - // public string WMSDeliverGoodsState { set; get; } - - // /// - // /// 看板结算状态 - // /// - // public string WMSKanBanState { set; get; } - - // /// - // /// 出库单号 - // /// - // public string DeliveryOrderNo { set; get; } - - // /// - // /// 备注 - // /// - - // public string Extend { set; get; } - - - // public void SetValue(Guid guid, string year, string peroid, string version) - // { - // Period = peroid; - // Year = year; - // Id = guid; - // Version = version; - // } - // 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, - // //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; - // //CreationTime = creationTime; - // CreatorId = guid; - // } - - - - - - //} -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs deleted file mode 100644 index 84b4f406..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs +++ /dev/null @@ -1,47 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs deleted file mode 100644 index 2462194e..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs +++ /dev/null @@ -1,33 +0,0 @@ -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 WmsKanban: FullAuditedAggregateRootBase - { - - /// - /// 实际发货日期 - /// - public DateTime BeginTime { set; get; } - - /// - /// - /// - public string Version { set; get; } - /// - /// 零件号 - /// - public string MaterialCode { set; get; } - - /// - /// 用量 - /// - public decimal Qty { set; get; } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs deleted file mode 100644 index bb3cb651..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs +++ /dev/null @@ -1,308 +0,0 @@ -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) - { - Version = version; - ReceiptQty = receiptQty; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - SpareDate = spareDate; - } - - /// - /// 版本号 - /// - [Display(Name = "版本号")] - public string Version { set; get; } - - - - /// - /// SAP物料号 - /// - [Display(Name = "SAP物料号")] - public string SapCode { get; set; } - - - /// - /// 主机厂 - /// - [Display(Name = "主机厂")] - public string MainFactory { get; set; } - - /// - /// 车型 - /// - [Display(Name = "车型")] - public string MaterialGroup { get; set; } - - - /// - /// 物料代码-零件号 - /// - [Display(Name = "物料代码")] - public string MaterialCode { get; set; } - /// - /// 物料描述-存货名称 - /// - [Display(Name = "物料描述")] - public string MaterialDesc { get; set; } - - /// - /// 发货数量 - /// - [Display(Name = "发货数量")] - public decimal ReceiptQty { get; set; } - - /// - /// 订单号 - /// - [Display(Name = "订单号")] - public string PurchaseOrderNo { get; set; } - - /// - /// 交货单号 - /// - [Display(Name = "交货单号")] - public string WMSDeliveryNote { set; get; } - - /// - /// 交货日期 - /// - [Display(Name = "交货日期")] - public DateTime SpareDate { get; set; } - - - } - //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 WMSSparePartState { set; get; } - - - - //} -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs deleted file mode 100644 index 8c96e797..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs +++ /dev/null @@ -1,47 +0,0 @@ -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/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs deleted file mode 100644 index 5b599697..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs +++ /dev/null @@ -1,133 +0,0 @@ -using System; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Magicodes.ExporterAndImporter.Core; -using Volo.Abp.Domain.Entities; - -namespace WY.NewJit.Extends.PaiGe.WMS -{ - public partial class TB_BILL:IEntity - { - [DatabaseGenerated(DatabaseGeneratedOption.Computed)] - [Display(AutoGenerateField = false)] - [ScaffoldColumn(false)] - public int UID { get; set; } - - [Key] - [StringLength(50)] - - [DisplayName("单据编号")] - [ExporterHeader(DisplayName = "单据编号")] - [ImporterHeader(Name = "单据编号")] - public string BillNum { get; set; } = ""; - - public int State { get; set; } - - [DisplayName("原始单据")] - [ExporterHeader(DisplayName = "原始单据")] - public string SourceBillNum { get; set; } = ""; - - //[StringLength(50)] - [DisplayName("原始单据2")] - [ExporterHeader(DisplayName = "原始单据2")] - public string SourceBillNum2 { get; set; } = ""; - - //[StringLength(50)] - [DisplayName("原始单据3")] - [ExporterHeader(DisplayName = "原始单据3")] - public string SourceBillNum3 { get; set; } = ""; - - [DisplayName("单据类型")] - [ExporterHeader(DisplayName = "单据类型")] - [NotMapped] - public string BillType { get; set; } - - [DisplayName("单据子类型")] - [ExporterHeader(DisplayName = "单据子类型")] - [NotMapped] - public string SubBillType { get; set; } - - [DisplayName("单据时间")] - [ExporterHeader(DisplayName = "单据时间")] - public DateTime BillTime { get; set; } - - [StringLength(50)] - [DisplayName("开始时间")] - [ExporterHeader(DisplayName = "开始时间")] - public string StartTime { get; set; } - - [StringLength(50)] - [DisplayName("结束时间")] - [ExporterHeader(DisplayName = "结束时间")] - public string FinishTime { get; set; } - - [Required(AllowEmptyStrings = true)] - [StringLength(50)] - [DisplayName("操作员")] - [ExporterHeader(DisplayName = "操作员")] - public string OperName { get; set; } - - [DisplayName("明细数量")] - [ExporterHeader(DisplayName = "明细数量")] - public int DetailQty { get; set; } - - [StringLength(50)] - [DisplayName("供应商编号")] - [ExporterHeader(DisplayName = "供应商编号")] - public string VendId { get; set; } - - [StringLength(50)] - [DisplayName("客户编号")] - [ExporterHeader(DisplayName = "客户编号")] - public string CustId { get; set; } - - [StringLength(50)] - [DisplayName("项目编号")] - [ExporterHeader(DisplayName = "项目编号")] - public string ProjectId { get; set; } - - [StringLength(50)] - [DisplayName("运输方式")] - [ExporterHeader(DisplayName = "运输方式")] - public string TransportType { get; set; } - - [StringLength(50)] - [DisplayName("车牌号")] - [ExporterHeader(DisplayName = "运输方式")] - public string TruckNum { get; set; } - - [StringLength(50)] - [DisplayName("到货门编号")] - [ExporterHeader(DisplayName = "到货门编号")] - public string GateCode { get; set; } - - [StringLength(50)] - [DisplayName("到货门名称")] - [ExporterHeader(DisplayName = "到货门名称")] - public string GateName { get; set; } - - //[StringLength(50)] - [DisplayName("到货口编号")] - [ExporterHeader(DisplayName = "到货口编号")] - public string DockCode { get; set; } - - [DisplayName("备注")] - [ExporterHeader(DisplayName = "备注")] - public string Remark { get; set; } - - public DateTime? AccountDate { get; set; } - - - public Guid GUID { get; set; } = Guid.NewGuid(); - - public TB_BILL() - { - } - - public object[] GetKeys() - { - throw new NotImplementedException(); - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs deleted file mode 100644 index b76a0a46..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace ChangKeTec.Wms.Models.Wms -{ - public partial class TS_SORT_DETAIL - { - - [DatabaseGenerated(DatabaseGeneratedOption.Computed)] - public long UID { get; set; } - - [Key] - [Column(Order = 0)] - [StringLength(50)] - [DisplayName("单据编号")] - public string BillNum { get; set; } - - [DisplayName("行号")] - public int LineNum { get; set; } - - [Key] - [Column(Order = 1)] - [StringLength(50)] - [DisplayName("VIN码")] - public string VinCode { get; set; } - - [Required(AllowEmptyStrings = true)] - [StringLength(50)] - [DisplayName("顺序号")] - public string SeqNum { get; set; } - - /// - /// SAP物料号 - /// - [Key] - [Column(Order = 2)] - [StringLength(50)] - [DisplayName("物料号")] - public string PartCode { get; set; } - - [DisplayName("箱码")] - public string BarCode { get; set; } - - [StringLength(50)] - [DisplayName("客户物料号")] - public string CustPartCode { get; set; } - - - [Required(AllowEmptyStrings = true)] - [StringLength(50)] - [DisplayName("项目编号")] - public string ProjectId { get; set; } - - [StringLength(50)] - [DisplayName("FYON NUMBER")] - public string FyonNum { get; set; } - - [StringLength(50)] - [DisplayName("SUPPLIER")] - public string VendId { get; set; } - - [StringLength(50)] - [DisplayName("DOCK")] - public string Dock { get; set; } - - [StringLength(50)] - [DisplayName("DISPATCH DATE")] - public string DispatchDate { get; set; } - - [Required(AllowEmptyStrings = true)] - [StringLength(50)] - [DisplayName("状态")] - public string State { get; set; } - - [StringLength(200)] - [DisplayName("备注")] - public string Remark { get; set; } - - [Column(TypeName = "money")] - [DisplayName("计划数量")] - public decimal PlanQty { get; set; } = 0; - - [Column(TypeName = "money")] - [DisplayName("发货数量")] - public decimal Qty { get; set; } = 0; - - [StringLength(200)] - [DisplayName("客户条码")] - public string CustBarCode { get; set; } = string.Empty; - - [Column(TypeName = "money")] - [DisplayName("回执数量")] - public decimal ReceiptQty { get; set; } = 0; - - [StringLength(200)] - [DisplayName("箱码(Full)")] - public string FullBarCode { get; set; } = string.Empty; - - [NotMapped] - public string PartGroup { get; set; } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs deleted file mode 100644 index dccb6322..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ /dev/null @@ -1,2613 +0,0 @@ -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -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 -{ - public partial class TS_UNI_API: FullAuditedAggregateRootBase - { - public TS_UNI_API(Guid guid ,string interfaceType, string version, string tableName, string sourceBillNum, int wmsState, int settleAccountState, Guid taskId) - { - InterfaceType = interfaceType; - Version = version; - TableName = tableName; - SourceBillNum = sourceBillNum; - WmsState = wmsState; - SettleAccountState = settleAccountState; - TaskId = taskId; - } - /// - /// 接口类型 - /// - public string InterfaceType { get; set; } - /// - /// 版本号 - /// - public string Version { get; set; } - /// - /// 表明 - /// - public string TableName { get; set; } - - /// - /// 原单据号 - /// - public string SourceBillNum { get; set; } - - /// - /// 状态 - /// - public int WmsState { set; get; } - /// - /// 状态 - /// - public int SettleAccountState { set; get; } - - /// - /// 状态 - /// - public Guid TaskId { set; get; } - - - } - - - #region 客户代码 - - public class WmsCustomerKanbanOutPut : FullAuditedAggregateRootBase - { - public WmsCustomerKanbanOutPut() - { - } - - public WmsCustomerKanbanOutPut(Guid id, string version, string billNum, string creator,string customercode,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - CustomerCode = customercode; - SumContent = content; - } - - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - public string CustomerCode { set; get; } - - public string SumContent { set; get; } - } - - - /// - /// H平台出库单 - /// - public class WmsCustomerKanbanOutPutDetial : FullAuditedAggregateRootBase - { - public WmsCustomerKanbanOutPutDetial() - { - } - - public WmsCustomerKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string sapmaterialCode, string materialDesc, string materialGroup, - string outPut, string inPut, int state, string extend1, string extend2, string extend3, string materialCode, string billNum, - Guid taskId, string remark, decimal qty, decimal price, decimal amt,string customerCode) - { - Id = id; - WmsBillNum = wmsBillNum; - Kanban = kanban; - SapMaterialCode = sapmaterialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - MaterialCode = materialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - - Price = price; - Amt = amt; - CustomerCode = customerCode; - } - public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId,string customerCode) - { - Id = id; - Remark = remark; - WmsBillNum = wmsbillnum; - Version = version; - TaskId = taskId; - CustomerCode = customerCode; - } - - - [ImporterHeader(Name = "客户编码")] - [ExporterHeader(DisplayName = "客户编码")] - public string CustomerCode { set; get; } - - [ImporterHeader(Name = "看板编号")] - [ExporterHeader(DisplayName = "看板编号")] - //KENN号 - public string Kanban { set; get; } - - [ImporterHeader(Name = "客户零件号", IsIgnore = true)] - [ExporterHeader(DisplayName = "客户零件号", IsIgnore = true)] - public string MaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { set; get; } - //[ImporterHeader(Name = "订货看板编号")] - ////KENN号 - //public string OrderBillNum { set; get; } - [ImporterHeader(Name = "SAP零件号")] - [ExporterHeader(DisplayName = "SAP零件号")] - //物料号 - public string SapMaterialCode { set; get; } - [ImporterHeader(Name = "零件中文名称")] - [ExporterHeader(DisplayName = "零件中文名称")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "发货零件号",IsIgnore =true)] - [ExporterHeader(DisplayName = "发货零件号",IsIgnore =true)] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - - [ImporterHeader(Name = "收货仓库", IsIgnore = true)] - [ExporterHeader(DisplayName = "收货仓库", IsIgnore = true)] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "结算单价")] - [ExporterHeader(DisplayName = "结算单价")] - public decimal Price { set; get; } - [ImporterHeader(Name = "结算金额")] - [ExporterHeader(DisplayName = "结算金额")] - public decimal Amt { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "数量", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务描述", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] - public Guid TaskId { set; get; } - - - - } - - - /// - /// 根据ＤＴＯ自动生成模板，供前端下载模板用 - /// - public class WmsCustomerKanbanOutPutDetialDTO - { - public WmsCustomerKanbanOutPutDetialDTO() - { - } - - [ImporterHeader(Name = "客户编码")] - [ExporterHeader(DisplayName = "客户编码")] - public string CustomerCode { set; get; } - - [ImporterHeader(Name = "看板编号")] - [ExporterHeader(DisplayName = "看板编号")] - //KENN号 - public string Kanban { set; get; } - - [ImporterHeader(Name = "客户零件号", IsIgnore = true)] - [ExporterHeader(DisplayName = "客户零件号", IsIgnore = true)] - public string MaterialCode { set; get; } - [ImporterHeader(Name = "交货单号", IsIgnore = true)] - [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] - public string WmsBillNum { set; get; } - //[ImporterHeader(Name = "订货看板编号")] - ////KENN号 - //public string OrderBillNum { set; get; } - [ImporterHeader(Name = "SAP零件号")] - [ExporterHeader(DisplayName = "SAP零件号")] - //物料号 - public string SapMaterialCode { set; get; } - [ImporterHeader(Name = "零件中文名称")] - [ExporterHeader(DisplayName = "零件中文名称")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)", IsIgnore = true)] - [ExporterHeader(DisplayName = "物料组(车型)", IsIgnore = true)] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "发货零件号", IsIgnore = true)] - [ExporterHeader(DisplayName = "发货零件号", IsIgnore = true)] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - - [ImporterHeader(Name = "收货仓库", IsIgnore = true)] - [ExporterHeader(DisplayName = "收货仓库", IsIgnore = true)] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "结算单价")] - [ExporterHeader(DisplayName = "结算单价")] - public decimal Price { set; get; } - [ImporterHeader(Name = "结算金额")] - [ExporterHeader(DisplayName = "结算金额")] - public decimal Amt { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "数量", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务描述", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] - public Guid TaskId { set; get; } - - - - } - - - - - - #endregion - - - - - - - - - - - - - - - - - - /// - /// 准时化出库主表 - /// - public class WmsJitOutPut : FullAuditedAggregateRootBase - { - public WmsJitOutPut() - { - } - - public WmsJitOutPut(Guid id,string version, string billNum, string creator,string content):base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - - public string BillNum { set; get; } - - public string Creator { set; get; } - - - public string SumContent { set; get; } - - - - - } - - - - - - /// - /// 准时化出库明细 - /// - public class WmsJitOutPutDetial : FullAuditedAggregateRootBase - { - public WmsJitOutPutDetial() - { - } - - - - public WmsJitOutPutDetial(Guid id, string wmsBillNum, string kennCode, string chassisNumber, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode,string billNum,Guid taskId,string remark,decimal qty, decimal price, decimal amt) :base(id) - { - Id = id; - WmsBillNum = wmsBillNum; - KennCode = kennCode; - ChassisNumber = chassisNumber; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - Amt = amt; - Price = price; - - } - - - - public void SetData(Guid guid,string output,string input,string extend1,string extend2,string version,Guid taskid) - { - Id = guid; - OutPut = output; - InPut = input; - Extend1 = extend1; - Extend2 = extend2; - Version = version; - TaskId=taskid; - } - - [ExporterHeader(DisplayName = "出库库位")] - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位")] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态")] - [ExporterHeader(DisplayName = "状态")] - public int State { get; set; } - - [ImporterHeader(Name = "开票单价")] - [ExporterHeader(DisplayName = "开票单价")] - - public decimal Price { set; get; } - [ImporterHeader(Name = "开票金额")] - [ExporterHeader(DisplayName = "开票金额")] - public decimal Amt { set; get; } - [ImporterHeader(Name = "开票单价",IsIgnore =true)] - [ExporterHeader(DisplayName = "开票单价")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ExporterHeader(DisplayName = "开票金额")] - [ImporterHeader(Name = "开票金额", IsIgnore = true)] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ExporterHeader(DisplayName = "版本号")] - [ImporterHeader(Name = "版本号", IsIgnore = true)] - public string Version { set; get; } - - [ExporterHeader(DisplayName = "单号")] - [ImporterHeader(Name = "单号",IsIgnore =true)] - public string BillNum { set; get; } - [ExporterHeader(DisplayName = "任务号", IsIgnore = true)] - [ImporterHeader(Name = "任务号", IsIgnore = true)] - public Guid TaskId { set; get; } - - [ExporterHeader(DisplayName = "交货单号")] - [ImporterHeader(Name = "交货单号", AutoTrim = true)] - public string WmsBillNum { set; get; } - [ExporterHeader(DisplayName = "KENN号")] - [ImporterHeader(Name = "KENN号")] - //KENN号 - public string KennCode { set; get; } - [ExporterHeader(DisplayName = "底盘号")] - [ImporterHeader(Name = "底盘号", AutoTrim = true)] - //底盘号 - public string ChassisNumber { set; get; } - [ExporterHeader(DisplayName = "物料号")] - [ImporterHeader(Name = "物料号", AutoTrim = true)] - //物料号 - public string MaterialCode { set; get; } - [ExporterHeader(DisplayName = "组件组物料")] - [ImporterHeader(Name = "组件组物料",AutoTrim =true)] - //物料号 - public string ParentMaterialCode { set; get; } - [ExporterHeader(DisplayName = "物料描述")] - [ImporterHeader(Name = "物料描述", AutoTrim = true)] - //物料描述 - public string MaterialDesc { set; get; } - [ExporterHeader(DisplayName = "物料组(车型)")] - [ImporterHeader(Name = "物料组(车型)", AutoTrim = true)] - //物料组(车型) - public string MaterialGroup { set; get; } - [ExporterHeader(DisplayName = "结算数量")] - [ImporterHeader(Name = "结算数量")] - public decimal Qty { set; get; } - - ////以下继承的全部不导出 - - //[ExporterHeader(DisplayName = "BranchId", IsIgnore = true)] - //public Guid BranchId { set; get; } - - //[ExporterHeader(DisplayName = "Enabled", IsIgnore = true)] - //public bool Enabled { set; get; } - - //[ExporterHeader(DisplayName = "Remark", IsIgnore = true)] - //public string Remark { set; get; } - - //[ExporterHeader(DisplayName = "IsDeleted", IsIgnore = true)] - //public bool IsDeleted { set; get; } - - //[ExporterHeader(DisplayName = "DeleterId", IsIgnore = true)] - //public bool DeleterId { set; get; } - - //[ExporterHeader(DisplayName = "DeletionTime", IsIgnore = true)] - //public DateTime DeletionTime { set; get; } - - //[ExporterHeader(DisplayName = "LastModificationTime", IsIgnore = true)] - //public DateTime LastModificationTime { set; get; } - - //[ExporterHeader(DisplayName = "LastModifierId", IsIgnore = true)] - //public Guid LastModifierId { set; get; } - - //[ExporterHeader(DisplayName = "CreationTime", IsIgnore = true)] - //public DateTime CreationTime { set; get; } - - //[ExporterHeader(DisplayName = "CreatorId", IsIgnore = true)] - //public Guid CreatorId { set; get; } - - //[ExporterHeader(DisplayName = "ExtraProperties", IsIgnore = true)] - //public string ExtraProperties { set; get; } - - //[ExporterHeader(DisplayName = "ConcurrencyStamp", IsIgnore = true)] - //public DateTime ConcurrencyStamp { set; get; } - - //[ExporterHeader(DisplayName = "Id", IsIgnore = true)] - //public Guid Id { set; get; } - - - - - } - - - - - - public class WmsKanbanOutPut : FullAuditedAggregateRootBase - { - public WmsKanbanOutPut() - { - } - - public WmsKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - - public string BillNum { set; get; } - - public string Creator { set; get; } - public string SumContent { set; get; } - - - } - - - /// - /// 看板明细 - /// - public class WmsKanbanOutPutDetial : FullAuditedAggregateRootBase - { - public WmsKanbanOutPutDetial() - { - } - - public WmsKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty, decimal price, decimal amt) - { - Id = id; - WmsBillNum = wmsBillNum; - Kanban = kanban; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - Price = price; - Amt = amt; - - } - - - - public void SetData(Guid id,string remark,string wmsbillnum,string version,Guid taskId) - { - Id = id; - Remark = remark; - WmsBillNum = wmsbillnum; - Version = version; - TaskId = taskId; - - } - // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 - - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - - [ImporterHeader(Name = "组件组物料",IsIgnore =true)] - public string ParentMaterialCode { set; get; } - [ExporterHeader(DisplayName = "交货单号")] - [ImporterHeader(Name = "交货单号")] - public string WmsBillNum { set; get; } - [ExporterHeader(DisplayName = "条码号")] - [ImporterHeader(Name = "条码号")] - //KENN号 - public string Kanban { set; get; } - [ExporterHeader(DisplayName = "物料号")] - [ImporterHeader(Name = "物料号")] - //物料号 - public string MaterialCode { set; get; } - [ExporterHeader(DisplayName = "物料描述")] - [ImporterHeader(Name = "物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - [ExporterHeader(DisplayName = "物料组(车型)")] - [ImporterHeader(Name = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ExporterHeader(DisplayName = "出库库位")] - [ImporterHeader(Name = "出库库位",IsIgnore =true)] - //出库库位 - public string OutPut { set; get; } - [ExporterHeader(DisplayName = "入库库位")] - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ExporterHeader(DisplayName = "状态")] - [ImporterHeader(Name = "状态",IsIgnore =true)] - public int State { get; set; } - [ExporterHeader(DisplayName = "客户物料")] - [ImporterHeader(Name = "客户物料")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ExporterHeader(DisplayName = "订单日期")] - [ImporterHeader(Name = "订单日期")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ExporterHeader(DisplayName = "结算数量")] - [ImporterHeader(Name = "结算数量")] - public decimal Qty { set; get; } - [ExporterHeader(DisplayName = "单据")] - [ImporterHeader(Name = "单据", IsIgnore = true)] - public string BillNum { set; get; } - [ExporterHeader(DisplayName = "任务", IsIgnore = true)] - [ImporterHeader(Name = "任务", IsIgnore = true)] - public Guid TaskId { set; get; } - [ExporterHeader(DisplayName = "开票单价")] - [ImporterHeader(Name = "开票单价")] - - public decimal Price { set; get; } - [ExporterHeader(DisplayName = "开票金额")] - [ImporterHeader(Name = "开票金额")] - public decimal Amt { set; get; } - - - - } - - - public class WmsWithOutKanbanOutPut : FullAuditedAggregateRootBase - { - public WmsWithOutKanbanOutPut() - { - } - - public WmsWithOutKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - - public string BillNum { set; get; } - - public string Creator { set; get; } - - public string SumContent { set; get; } - - } - - - /// - /// 看板明细 - /// - public class WmsWithOutKanbanOutPutDetial : FullAuditedAggregateRootBase - { - public WmsWithOutKanbanOutPutDetial() - { - } - - - - public WmsWithOutKanbanOutPutDetial(Guid id ,string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend,string billnum,int state,decimal realqty, decimal price, decimal amt) :base(id) - { - Type = type; - SapMaterialCode = sapMaterialCode; - MaterialDesc = materialDesc; - Version = version; - IsBack = isBack; - Remark = remark; - Qty = qty; - SockQty = sockQty; - OutputQty = outputQty; - Extend = extend; - BillNum = billnum; - State = state; - RealityNumber = realqty; - Price = price; - Amt = amt; - } - - - - [ImporterHeader(Name = "单据类型")] - [ExporterHeader(DisplayName = "单据类型")] - public string Type { set; get; } - [ImporterHeader(Name = "物料号")] - [ExporterHeader(DisplayName = "物料号")] - public string SapMaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] - [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "版本号")] - [ExporterHeader(DisplayName = "版本号")] - public string Version { set; get; } - [ImporterHeader(Name = "是否备件")] - [ExporterHeader(DisplayName = "是否备件")] - public string IsBack { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)] - public decimal SockQty { set; get; } - - [ImporterHeader(Name = "真实数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)] - public decimal RealityNumber { set; get; } - - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutputQty { set; get; } - [ImporterHeader(Name = "Extend", IsIgnore = true)] - [ExporterHeader(DisplayName = "Extend", IsIgnore = true)] - public string Extend { set; get; } - [ImporterHeader(Name = "BillNum", IsIgnore = true)] - [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { set; get; } - [ImporterHeader(Name = "开票单价")] - [ExporterHeader(DisplayName = "开票单价")] - - public decimal Price { set; get; } - [ImporterHeader(Name = "开票金额")] - [ExporterHeader(DisplayName = "开票金额")] - public decimal Amt { set; get; } - - - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public class WmsHQWithOutKanbanOutPut : FullAuditedAggregateRootBase - { - public WmsHQWithOutKanbanOutPut() - { - } - - public WmsHQWithOutKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - - public string BillNum { set; get; } - - public string Creator { set; get; } - - public string SumContent { set; get; } - - } - - - /// - /// 看板明细 - /// - public class WmsHQWithOutKanbanOutPutDetial : FullAuditedAggregateRootBase - { - public WmsHQWithOutKanbanOutPutDetial() - { - } - - - - public WmsHQWithOutKanbanOutPutDetial(Guid id, string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend, string billnum, int state, decimal realqty, decimal price, decimal amt) : base(id) - { - Type = type; - SapMaterialCode = sapMaterialCode; - MaterialDesc = materialDesc; - Version = version; - IsBack = isBack; - Remark = remark; - Qty = qty; - SockQty = sockQty; - OutputQty = outputQty; - Extend = extend; - BillNum = billnum; - State = state; - RealityNumber = realqty; - Price = price; - Amt = amt; - } - - - - [ImporterHeader(Name = "单据类型", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据类型", IsIgnore = true)] - public string Type { set; get; } - [ImporterHeader(Name = "物料号")] - [ExporterHeader(DisplayName = "物料号")] - public string SapMaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] - [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "版本号")] - [ExporterHeader(DisplayName = "版本号")] - public string Version { set; get; } - [ImporterHeader(Name = "是否备件")] - [ExporterHeader(DisplayName = "是否备件")] - public string IsBack { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)] - public decimal SockQty { set; get; } - - [ImporterHeader(Name = "真实数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)] - public decimal RealityNumber { set; get; } - - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutputQty { set; get; } - [ImporterHeader(Name = "客户")] - [ExporterHeader(DisplayName = "客户")] - public string Extend { set; get; } - [ImporterHeader(Name = "BillNum", IsIgnore = true)] - [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { set; get; } - [ImporterHeader(Name = "开票单价")] - [ExporterHeader(DisplayName = "开票单价")] - - public decimal Price { set; get; } - [ImporterHeader(Name = "开票金额")] - [ExporterHeader(DisplayName = "开票金额")] - public decimal Amt { set; get; } - - } - - #region 一次性寄售销售结算主表 - /// - /// 一次性寄售销售结算主表 - /// - public class WmsOneTimeSaleOutPut : FullAuditedAggregateRootBase - { - public WmsOneTimeSaleOutPut() - { - } - - public WmsOneTimeSaleOutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - - public string BillNum { set; get; } - - public string Creator { set; get; } - - public string SumContent { set; get; } - - } - - - /// - /// 一次性寄售销售从表 - /// - public class WmsOneTimeSaleOutPutDetial : FullAuditedAggregateRootBase - { - public WmsOneTimeSaleOutPutDetial() - { - } - - - - public WmsOneTimeSaleOutPutDetial(Guid id, string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend, string billnum, int state, decimal realqty, decimal price, decimal amt) : base(id) - { - Type = type; - SapMaterialCode = sapMaterialCode; - MaterialDesc = materialDesc; - Version = version; - IsBack = isBack; - Remark = remark; - Qty = qty; - SockQty = sockQty; - OutputQty = outputQty; - Extend = extend; - BillNum = billnum; - State = state; - RealityNumber = realqty; - Price = price; - Amt = amt; - } - - - - [ImporterHeader(Name = "单据类型", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据类型", IsIgnore = true)] - public string Type { set; get; } - [ImporterHeader(Name = "物料号")] - [ExporterHeader(DisplayName = "物料号")] - public string SapMaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] - [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "版本号")] - [ExporterHeader(DisplayName = "版本号")] - public string Version { set; get; } - [ImporterHeader(Name = "是否备件")] - [ExporterHeader(DisplayName = "是否备件")] - public string IsBack { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)] - public decimal SockQty { set; get; } - - [ImporterHeader(Name = "真实数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)] - public decimal RealityNumber { set; get; } - - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutputQty { set; get; } - [ImporterHeader(Name = "客户")] - [ExporterHeader(DisplayName = "客户")] - public string Extend { set; get; } - [ImporterHeader(Name = "BillNum", IsIgnore = true)] - [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { set; get; } - [ImporterHeader(Name = "开票单价")] - [ExporterHeader(DisplayName = "开票单价")] - - public decimal Price { set; get; } - [ImporterHeader(Name = "开票金额")] - [ExporterHeader(DisplayName = "开票金额")] - public decimal Amt { set; get; } - - - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] - public string WmsBillNum { set; get; } - [ExporterHeader(DisplayName = "订单号", IsIgnore = true)] - //KENN号 - public string OrderBillNum { set; get; } - - } - - - #endregion - - - - #region 红旗M平台出库 - - /// - /// 看板M平台明细 - /// - public class WmsHQMKanbanOutPutDetial : FullAuditedAggregateRootBase - { - public WmsHQMKanbanOutPutDetial() - { - } - - public WmsHQMKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, string poline) - { - Id = id; - WmsBillNum = wmsBillNum; - Kanban = kanban; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - PoLine = poline; - } - public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId) - { - Id = id; - Remark = remark; - WmsBillNum = wmsbillnum; - Version = version; - TaskId = taskId; - } - // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 - [ImporterHeader(Name = "行号")] - [ExporterHeader(DisplayName = "行号")] - public string PoLine { set; get; } - - [ImporterHeader(Name = "订货看板编号")] - [ExporterHeader(DisplayName = "订货看板编号")] - //KENN号 - public string Kanban { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { set; get; } - //[ImporterHeader(Name = "订货看板编号")] - ////KENN号 - //public string OrderBillNum { set; get; } - [ImporterHeader(Name = "Sap编码")] - [ExporterHeader(DisplayName = "Sap编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "零件中文名称")] - [ExporterHeader(DisplayName = "零件中文名称")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "发货零件号")] - [ExporterHeader(DisplayName = "发货零件号")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "收货仓库")] - [ExporterHeader(DisplayName = "收货仓库")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "数量", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务描述", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] - public Guid TaskId { set; get; } - - } - - public class WmsHQMKanbanOutPut : FullAuditedAggregateRootBase - { - public WmsHQMKanbanOutPut() - { - } - - public WmsHQMKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - } - - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - } - - /// - /// 备件出库 - /// - public class WmsHQMSharePartOutPut : FullAuditedAggregateRootBase - { - public WmsHQMSharePartOutPut() - { - } - public WmsHQMSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - } - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - - } - - - /// - /// M平台-备件出库明细 - /// - public class WmsHQMSharePartOutPutDetial : FullAuditedAggregateRootBase - { - - public WmsHQMSharePartOutPutDetial() - { - } - public WmsHQMSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty,decimal outputQty) - { - Id = id; - WmsBillNum = wmsBillNum; - OrderBillNum = orderBillNum; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - StockQty = stockQty; - OutPutQty = outputQty; - BranchId = Id; - } - public void SetId(Guid id) - { - Id = id; - } - //交货单号 - - [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] - public decimal StockQty { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号", IsIgnore = true)] - [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] - public string WmsBillNum { set; get; } - [ImporterHeader(Name = "看板号", IsIgnore = true)] - [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] - //KENN号 - public string OrderBillNum { set; get; } - [ImporterHeader(Name = "Sap编码")] - [ExporterHeader(DisplayName = "Sap编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "结算物料描述")] - [ExporterHeader(DisplayName = "结算物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "结算物料号")] - [ExporterHeader(DisplayName = "结算物料号")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "收货仓库")] - [ExporterHeader(DisplayName = "收货仓库")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "单据号", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务ID", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] - public Guid TaskId { set; get; } - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutPutQty { set; get; } - } - - #endregion - - #region 一汽轿车出库 - /// - /// 一汽轿车出库 - /// - public class WmsHQCarOutPut : FullAuditedAggregateRootBase - { - public WmsHQCarOutPut() - { - } - public WmsHQCarOutPut(Guid id, string version, string billNum, string creator) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - } - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - - } - - - /// - /// 一汽轿车出库明细 - /// - public class WmsHQCarOutPutDetial : FullAuditedAggregateRootBase - { - - public WmsHQCarOutPutDetial() - { - } - public WmsHQCarOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, - string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, - string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, string issparepart,decimal price,decimal amt) - { - Id = id; - WmsBillNum = wmsBillNum; - OrderBillNum = orderBillNum; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - StockQty = stockQty; - OutPutQty = outputQty; - IsSparePart = issparepart; - Price = price; - Amt = amt; - } - public void SetId(Guid id) - { - Id = id; - } - - [ImporterHeader(Name = "是否备件", IsIgnore = true)] - [ExporterHeader(DisplayName = "是否备件", IsIgnore = true)] - public string IsSparePart { set; get; } - //交货单号 - - [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] - public decimal StockQty { set; get; } - - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutPutQty { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号", IsIgnore = true)] - [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] - public string WmsBillNum { set; get; } - [ImporterHeader(Name = "看板号", IsIgnore = true)] - [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] - //KENN号 - public string OrderBillNum { set; get; } - [ImporterHeader(Name = "SAP编码")] - [ExporterHeader(DisplayName = "SAP编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] - [ExporterHeader(DisplayName = "物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组")] - [ExporterHeader(DisplayName = "物料组")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "结算物料号")] - [ExporterHeader(DisplayName = "结算物料号")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "收货仓库")] - [ExporterHeader(DisplayName = "收货仓库")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - - [ImporterHeader(Name = "结算单价")] - [ExporterHeader(DisplayName = "结算单价")] - public decimal Price { set; get; } - - [ImporterHeader(Name = "结算金额")] - [ExporterHeader(DisplayName = "结算金额")] - public decimal Amt { set; get; } - - - [ImporterHeader(Name = "单据号", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务ID", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] - public Guid TaskId { set; get; } - } - #endregion - - - - - #region 红旗看板 - - public class WmsHQFKanbanOutPut : FullAuditedAggregateRootBase - { - public WmsHQFKanbanOutPut() - { - } - - public WmsHQFKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - public string SumContent { set; get; } - } - - - /// - /// 看板明细 - /// - public class WmsHQFKanbanOutPutDetial : FullAuditedAggregateRootBase - { - public WmsHQFKanbanOutPutDetial() - { - } - - public WmsHQFKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty,string poline) - { - Id = id; - WmsBillNum = wmsBillNum; - Kanban = kanban; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - PoLine = poline; - } - public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId) - { - Id = id; - Remark = remark; - WmsBillNum = wmsbillnum; - Version = version; - TaskId = taskId; - } - // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 - [ImporterHeader(Name = "行号")] - [ExporterHeader(DisplayName = "行号")] - public string PoLine { set; get; } - - [ImporterHeader(Name = "订货看板编号")] - [ExporterHeader(DisplayName = "订货看板编号")] - //KENN号 - public string Kanban { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { set; get; } - //[ImporterHeader(Name = "订货看板编号")] - ////KENN号 - //public string OrderBillNum { set; get; } - [ImporterHeader(Name = "Sap编码")] - [ExporterHeader(DisplayName = "Sap编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "零件中文名称")] - [ExporterHeader(DisplayName = "零件中文名称")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "发货零件号")] - [ExporterHeader(DisplayName = "发货零件号")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "收货仓库")] - [ExporterHeader(DisplayName = "收货仓库")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "数量", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务描述", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] - public Guid TaskId { set; get; } - - - - - - - - - - - - - - - - - } - - /// - /// 备件出库 - /// - public class WmsHQFSharePartOutPut : FullAuditedAggregateRootBase - { - public WmsHQFSharePartOutPut() - { - } - public WmsHQFSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - } - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - - } - - - /// - /// F平台-备件出库明细 - /// - public class WmsHQFSharePartOutPutDetial : FullAuditedAggregateRootBase - { - - public WmsHQFSharePartOutPutDetial() - { - } - public WmsHQFSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty,decimal outPutQty) - { - Id = id; - WmsBillNum = wmsBillNum; - OrderBillNum = orderBillNum; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - StockQty = stockQty; - OutPutQty = outPutQty; - BranchId = Id; - - } - public void SetId(Guid id) - { - Id = id; - } - //交货单号 - - [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] - public decimal StockQty { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号", IsIgnore = true)] - [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] - public string WmsBillNum { set; get; } - [ImporterHeader(Name = "看板号", IsIgnore = true)] - [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] - //KENN号 - public string OrderBillNum { set; get; } - [ImporterHeader(Name = "Sap编码")] - [ExporterHeader(DisplayName = "Sap编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "结算物料描述")] - [ExporterHeader(DisplayName = "结算物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "结算物料号")] - [ExporterHeader(DisplayName = "结算物料号")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "收货仓库")] - [ExporterHeader(DisplayName = "收货仓库")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "单据号", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务ID", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] - public Guid TaskId { set; get; } - - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutPutQty { set; get; } - } - - - - public class WmsHQHKanbanOutPut : FullAuditedAggregateRootBase - { - public WmsHQHKanbanOutPut() - { - } - - public WmsHQHKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - - } - public string SumContent { set; get; } - - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - } - - - /// - /// H平台出库单 - /// - public class WmsHQHKanbanOutPutDetial : FullAuditedAggregateRootBase - { - public WmsHQHKanbanOutPutDetial() - { - } - - public WmsHQHKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, - string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, - Guid taskId, string remark, decimal qty, string poline,decimal price,decimal amt) - { - Id = id; - WmsBillNum = wmsBillNum; - Kanban = kanban; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - PoLine = poline; - Price = price; - Amt = amt; - } - public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId) - { - Id = id; - Remark = remark; - WmsBillNum = wmsbillnum; - Version = version; - TaskId = taskId; - } - - - [ImporterHeader(Name = "行号")] - [ExporterHeader(DisplayName = "行号")] - public string PoLine { set; get; } - - [ImporterHeader(Name = "订货看板编号")] - [ExporterHeader(DisplayName = "订货看板编号")] - //KENN号 - public string Kanban { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { set; get; } - //[ImporterHeader(Name = "订货看板编号")] - ////KENN号 - //public string OrderBillNum { set; get; } - [ImporterHeader(Name = "Sap编码")] - [ExporterHeader(DisplayName = "Sap编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "零件中文名称")] - [ExporterHeader(DisplayName = "零件中文名称")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - - [ImporterHeader(Name = "订货零件号")] - [ExporterHeader(DisplayName = "订货零件号")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "收货仓库")] - [ExporterHeader(DisplayName = "收货仓库")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "结算单价")] - [ExporterHeader(DisplayName = "结算单价")] - public decimal Price { set; get; } - [ImporterHeader(Name = "结算金额")] - [ExporterHeader(DisplayName = "结算金额")] - public decimal Amt { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "数量", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务描述", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] - public Guid TaskId { set; get; } - - - - } - - /// - /// 备件出库 - /// - public class WmsHQHSharePartOutPut : FullAuditedAggregateRootBase - { - public WmsHQHSharePartOutPut() - { - } - public WmsHQHSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - } - public string Version { set; get; } - public string BillNum { set; get; } - public string Creator { set; get; } - - } - - - /// - /// H-平台-备件出库明细 - /// - public class WmsHQHSharePartOutPutDetial : FullAuditedAggregateRootBase - { - - - - - public WmsHQHSharePartOutPutDetial() - { - } - public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty,decimal stockQty,decimal outputQty) - { - Id = id; - WmsBillNum = wmsBillNum; - OrderBillNum = orderBillNum; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - StockQty = stockQty; - OutPutQty = outputQty; - BranchId = Id; - - - - - } - public void SetId(Guid id) - { - Id = id; - } - //交货单号 - - [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] - public decimal StockQty { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号", IsIgnore = true)] - [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] - public string WmsBillNum { set; get; } - [ImporterHeader(Name = "看板号", IsIgnore = true)] - [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] - //KENN号 - public string OrderBillNum { set; get; } - [ImporterHeader(Name = "Sap编码")] - [ExporterHeader(DisplayName = "Sap编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "结算物料描述")] - [ExporterHeader(DisplayName = "结算物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "结算物料号")] - [ExporterHeader(DisplayName = "结算物料号")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "收货仓库")] - [ExporterHeader(DisplayName = "收货仓库")] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "结算数量")] - [ExporterHeader(DisplayName = "结算数量")] - public decimal Qty { set; get; } - [ImporterHeader(Name = "单据号", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] - public string BillNum { set; get; } - [ImporterHeader(Name = "任务ID", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] - public Guid TaskId { set; get; } - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutPutQty { set; get; } - } - - - - - - #endregion - - /// - /// 备件无订单号出库 - /// - - public class WmsSharePartOutPutDetial2: FullAuditedAggregateRootBase - { - public WmsSharePartOutPutDetial2() - { - } - - public WmsSharePartOutPutDetial2(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty) - { - Id = id; - //WmsBillNum = wmsBillNum; - //OrderBillNum = orderBillNum; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - //MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - //ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - } - - - public void SetId(Guid id) - { - Id = id; - } - - - //[ImporterHeader(Name = "组件组物料")] - //public string ParentMaterialCode { set; get; } - //[ImporterHeader(Name = "交货单号")] - //public string WmsBillNum { set; get; } - //[ImporterHeader(Name = "采购订单号")] - ////KENN号 - //public string OrderBillNum { set; get; } - - [ImporterHeader(Name = "SAP编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - //[ImporterHeader(Name = "物料组(车型)",IsIgnore =true)] - ////物料组(车型) - //public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "物料代码")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "开票数量")] - public decimal InvoiceQty { set; get; } - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - public decimal Qty { set; get; } - [ImporterHeader(Name = "已出数量", IsIgnore = true)] - public decimal OutQty { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] - public string BillNum { set; get; } - - - public Guid TaskId { set; get; } - - - } - - - - - - /// - /// 备件出库 - /// - public class WmsSharePartOutPut : FullAuditedAggregateRootBase - { - public WmsSharePartOutPut() - { - } - - public WmsSharePartOutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - - public string BillNum { set; get; } - - public string Creator { set; get; } - - public string SumContent { set; get; } - - } - - - /// - /// 备件无单号出库明细 - /// - //[ExcelImporter(SheetName = "大众备件数据输出")] - public class WmsSharePartOutPutDetial : FullAuditedAggregateRootBase - { - public WmsSharePartOutPutDetial() - { - } - - public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, - string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, - string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, - decimal outputQty, decimal price, decimal amt,decimal realqty) - { - Id = id; - WmsBillNum = wmsBillNum; - OrderBillNum = orderBillNum; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - StockQty = stockQty; - OutPutQty = outputQty; - Price = price; - Amt = amt; - RealityNumber = realqty; - } - - - - public void SetId(Guid id) - { - Id = id; - } - - // 期间 交货单号 发货日期 采购订单号 SAP编码 物料代码 物料描述 物料组 开票单价 数量差异 发货数量 开票数量 定价 单价差异 - - - [ImporterHeader(Name = "组件组物料",IsIgnore =true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { set; get; } - [ImporterHeader(Name = "采购订单号")] - [ExporterHeader(DisplayName = "采购订单号")] - //KENN号 - public string OrderBillNum { set; get; } - - [ImporterHeader(Name = "SAP编码")] - [ExporterHeader(DisplayName = "SAP编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] - [ExporterHeader(DisplayName = "物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] - [ExporterHeader(DisplayName = "物料组(车型)")] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "物料代码")] - [ExporterHeader(DisplayName = "物料代码")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] - [ExporterHeader(DisplayName = "扩展字段2", IsIgnore = true)] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - [ImporterHeader(Name = "开票数量")] - [ExporterHeader(DisplayName = "开票数量")] - public decimal Qty { set; get; } - - [ImporterHeader(Name = "单据", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据", IsIgnore = true)] - public string BillNum { set; get; } - - - [ImporterHeader(Name = "任务代码", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务代码", IsIgnore = true)] - public Guid TaskId { set; get; } - - [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] - public decimal StockQty { set; get; } - - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutPutQty { set; get; } - - - [ImporterHeader(Name = "真实数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)] - public decimal RealityNumber { set; get; } - - - [ImporterHeader(Name = "开票单价")] - [ExporterHeader(DisplayName = "开票单价")] - - public decimal Price { set; get; } - [ImporterHeader(Name = "开票金额")] - [ExporterHeader(DisplayName = "开票金额")] - public decimal Amt { set; get; } - - - } - - - - - - public class WmsSharePart90OutPut : FullAuditedAggregateRootBase - { - public WmsSharePart90OutPut() - { - } - - public WmsSharePart90OutPut(Guid id, string version, string billNum, string creator,string content) : base(id) - { - Id = id; - Version = version; - BillNum = billNum; - Creator = creator; - SumContent = content; - } - - public string Version { set; get; } - - public string BillNum { set; get; } - - public string Creator { set; get; } - - public string SumContent { set; get; } - - } - - - - //public class WmsSharePart90OutPutDetial : FullAuditedAggregateRootBase - //{ - // public WmsSharePart90OutPutDetial() - // { - // } - - // public WmsSharePart90OutPutDetial(Guid id, DateTime spareDate, string orderGoodsData, string wmsBillNum, string orderBillNum, - // string materialCode, string materialDesc, string purchaseOrderNoText, string extend1, string extend2, string extend3, - // decimal billNum, decimal qty, decimal diffQty, decimal invoicePrice, decimal amountNoTax, decimal price, decimal diffPrice, decimal diffAmountNoTax,string billNO, - // Guid taskId, string remark, decimal stockQty, decimal outputQty, string outPut, string inPut, - // int state) - // { - // Id = id; - // SpareDate = spareDate; - // OrderGoodsData = orderGoodsData; - // WmsBillNum = wmsBillNum; - // OrderBillNum = orderBillNum; - // MaterialCode = materialCode; - // MaterialDesc = materialDesc; - // PurchaseOrderNoText = purchaseOrderNoText; - // Extend1 = extend1; - // Extend2 = extend2; - // Version = extend3; - // BillNum = billNum; - // Qty = qty; - // DiffQty = diffQty; - // InvoicePrice = invoicePrice; - // AmountNoTax = amountNoTax; - // Price = price; - // DiffPrice = diffPrice; - // DiffAmountNoTax = diffAmountNoTax; - // BillNO = billNO; - // TaskId = taskId; - // Remark = remark; - - // StockQty = stockQty; - // OutPutQty = outputQty; - // OutPut = outPut; - // InPut = inPut; - // State = state; - // } - - - // public void SetId(Guid id) - // { - // Id = id; - // } - - // // 期间 交货单号 发货日期 采购订单号 SAP编码 物料代码 物料描述 物料组 开票单价 数量差异 发货数量 开票数量 定价 单价差异 - - - // [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] - // public decimal StockQty { set; get; } - - // [ImporterHeader(Name = "出库数量", IsIgnore = true)] - // public decimal OutPutQty { set; get; } - - // [ImporterHeader(Name = "交货日期", Format ="yyyy-MM-dd")] - // public DateTime SpareDate { get; set; } - - // [ImporterHeader(Name = "交货单号")] - // public string WmsBillNum { set; get; } - - // [ImporterHeader(Name = "订单日期")] - // public string OrderGoodsData { set; get; } - - // [ImporterHeader(Name = "采购订单号")] - // //KENN号 - // public string OrderBillNum { set; get; } - // [ImporterHeader(Name = "SAP编码")] - // public string MaterialCode { set; get; } - // [ImporterHeader(Name = "物料代码")] - // public string Extend1 { set; get; } - - // [ImporterHeader(Name = "物料描述")] - // public string MaterialDesc { set; get; } - - // [ImporterHeader(Name = "采购订单文本")] - // public string PurchaseOrderNoText { get; set; } - - // [ImporterHeader(Name = "发货数量", IsIgnore = true)] - // public decimal BillNum { set; get; } - - // [ImporterHeader(Name = "开票数量")] - // public decimal Qty { set; get; } - - // [ImporterHeader(Name = "发货与开票差异")] - // public decimal DiffQty { set; get; } - - // [ImporterHeader(Name = "开票单价")] - // public decimal InvoicePrice { get; set; } - - // [ImporterHeader(Name = "开票金额")] - // public decimal AmountNoTax { get; set; } - - // [ImporterHeader(Name = "定价")] - // public decimal Price { get; set; } - - // [ImporterHeader(Name = "单价差异")] - // public decimal DiffPrice { get; set; } - - // [ImporterHeader(Name = "差异总金额")] - // public decimal DiffAmountNoTax { get; set; } - - // [ImporterHeader(Name = "单据", IsIgnore = true)] - // public string BillNO { set; get; } - - - // [ImporterHeader(Name = "出库库位", IsIgnore = true)] - // //出库库位 - // public string OutPut { set; get; } - // [ImporterHeader(Name = "入库库位", IsIgnore = true)] - // //入库库位 - // public string InPut { set; get; } - // [ImporterHeader(Name = "状态", IsIgnore = true)] - // public int State { get; set; } - - // /// - // /// 扩展字段2 - // /// - // [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] - // public string Extend2 { set; get; } - // /// - // /// 扩展字段3 - // /// - // [ImporterHeader(Name = "版本号", IsIgnore = true)] - // public string Version { set; get; } - - - - - - // [ImporterHeader(Name = "任务代码", IsIgnore = true)] - // public Guid TaskId { set; get; } - - - //} - - - public class WmsSharePart90OutPutDetial : FullAuditedAggregateRootBase - { - public WmsSharePart90OutPutDetial() - { - } - - public WmsSharePart90OutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, decimal price, decimal amt) - { - Id = id; - WmsBillNum = wmsBillNum; - OrderBillNum = orderBillNum; - MaterialCode = materialCode; - MaterialDesc = materialDesc; - MaterialGroup = materialGroup; - OutPut = outPut; - InPut = inPut; - State = state; - Extend1 = extend1; - Extend2 = extend2; - Version = extend3; - ParentMaterialCode = parentMaterialCode; - BillNum = billNum; - TaskId = taskId; - Remark = remark; - Qty = qty; - StockQty = stockQty; - OutPutQty = outputQty; - Price = price; - Amt = amt; - } - - - - public void SetId(Guid id) - { - Id = id; - } - - // 期间 交货单号 发货日期 采购订单号 SAP编码 物料代码 物料描述 物料组 开票单价 数量差异 发货数量 开票数量 定价 单价差异 - - - [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] - public decimal StockQty { set; get; } - - [ImporterHeader(Name = "出库数量", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] - public decimal OutPutQty { set; get; } - - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] - [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] - public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] - [ExporterHeader(DisplayName = "交货单号")] - public string WmsBillNum { set; get; } - [ImporterHeader(Name = "采购订单号")] - [ExporterHeader(DisplayName = "采购订单号")] - //KENN号 - public string OrderBillNum { set; get; } - - [ImporterHeader(Name = "SAP编码")] - [ExporterHeader(DisplayName = "SAP编码")] - //物料号 - public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] - [ExporterHeader(DisplayName = "物料描述")] - //物料描述 - public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)", IsIgnore = true)] - [ExporterHeader(DisplayName = "物料组(车型)", IsIgnore = true)] - //物料组(车型) - public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] - //出库库位 - public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位", IsIgnore = true)] - [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] - //入库库位 - public string InPut { set; get; } - [ImporterHeader(Name = "状态", IsIgnore = true)] - [ExporterHeader(DisplayName = "状态", IsIgnore = true)] - public int State { get; set; } - [ImporterHeader(Name = "物料代码")] - [ExporterHeader(DisplayName = "物料代码")] - /// - /// 扩展字段1 - /// - public string Extend1 { set; get; } - /// - /// 扩展字段2 - /// - [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] - [ExporterHeader(DisplayName = "扩展字段2", IsIgnore = true)] - public string Extend2 { set; get; } - /// - /// 扩展字段3 - /// - [ImporterHeader(Name = "版本号", IsIgnore = true)] - [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] - public string Version { set; get; } - - [ImporterHeader(Name = "开票数量")] - [ExporterHeader(DisplayName = "开票数量")] - public decimal Qty { set; get; } - - [ImporterHeader(Name = "单据", IsIgnore = true)] - [ExporterHeader(DisplayName = "单据", IsIgnore = true)] - public string BillNum { set; get; } - - - [ImporterHeader(Name = "任务代码", IsIgnore = true)] - [ExporterHeader(DisplayName = "任务代码", IsIgnore = true)] - public Guid TaskId { set; get; } - [ImporterHeader(Name = "开票单价")] - [ExporterHeader(DisplayName = "开票单价")] - public decimal Price { set; get; } - [ImporterHeader(Name = "开票金额")] - [ExporterHeader(DisplayName = "开票金额")] - public decimal Amt { set; get; } - - - } - - - - - - - - - - - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs deleted file mode 100644 index 52acfb16..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs +++ /dev/null @@ -1,28 +0,0 @@ -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 -{ - public class WmsOutPutPercent:FullAuditedAggregateRootBase - { - public WmsOutPutPercent(Guid id,decimal completeQty, decimal applyQty, decimal cancelQty):base(id) - { - CompleteQty = completeQty; - ApplyQty = applyQty; - CancelQty = cancelQty; - } - - public decimal CompleteQty { set; get; } - - public decimal ApplyQty { set; get; } - - public decimal CancelQty { set; get; } - - - - } -} 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 72baf19e..b3795b1a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -7,16 +7,12 @@ using Win.Sfs.SettleAccount.Customers; using Win.Sfs.SettleAccount.Entities.Boms; using Win.Sfs.SettleAccount.Entities.CodeSettings; using Win.Sfs.SettleAccount.Entities.Controls; -using Win.Sfs.SettleAccount.Entities.EstimatedInventories; -using Win.Sfs.SettleAccount.Entities.EstimatedSums; using Win.Sfs.SettleAccount.FISes; using Win.Sfs.SettleAccount.Entities.Inventories; using Win.Sfs.SettleAccount.Entities.Materials; -using Win.Sfs.SettleAccount.Entities.SecondaryMatching; using Win.Sfs.SettleAccount.Prebatches; using Win.Sfs.SettleAccount.Entities.SettleAccounts; using Win.Sfs.SettleAccount.Entities.StorageLocations; -using Win.Sfs.SettleAccount.EstimatedInventories; using Win.Sfs.SettleAccount.EstimatedStockDiffReports; using Win.Sfs.SettleAccount.Inventories; using Win.Sfs.SettleAccount.MaterialRelationships; @@ -44,17 +40,8 @@ using Win.Sfs.SettleAccount.Entities.FISes; using Win.Sfs.SettleAccount.Entities.MaterialRelationships; using Win.Sfs.SettleAccount.Entities.SettlementParts; using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef; -using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences; -using Win.Sfs.SettleAccount.Entities.SettlementCrossReference; 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; -using Win.Sfs.SettleAccount.Entities.WMS_SparePart; -using Win.Sfs.SettleAccount.Entities.HQ_H; -using Win.Sfs.SettleAccount.Entities.WMS; + using Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts; using Win.Sfs.SettleAccount.Errors; @@ -75,227 +62,26 @@ namespace Win.Sfs.SettleAccount SettleAccountDbProperties.DbSchema ); - // optionsAction?.Invoke(options); - - #region 天合 - //产品结构 - builder.ConfigureBom(options); - - - //结算件 - builder.ConfigureSettlementPart(options); - - - - //ERP总成开票价格 - builder.ConfigureItemInvoicePrice(options); - builder.ConfigureItemInvoicePriceVersion(options); - - - //客户 - builder.ConfigureCustomer(options); - - //客户产品结构 - builder.ConfigureCustomerBom(options); - builder.ConfigureEstimatedSum(options); - builder.ConfigureCodeSetting(options); - builder.ConfigureMaterial(options); - builder.ConfigureEstimatedInventoryDetail(options); - builder.ConfigureInventoryDetail(options); - - - builder.ConfigureMaterialRelationship(options); - builder.ConfigureFIS(options); - builder.ConfigureFISExtend(options); - builder.ConfigureCentralizedControl(options); - builder.ConfigurePrebatch(options); - builder.ConfigureFactory(options); - builder.ConfigureSupplierItemSetUp(options); - builder.ConfigureSecondaryAdjustment(options); - builder.ConfigureSecondaryPriceRatio(options); - builder.ConfigureCustomerStorageLocation(options); - builder.ConfigureBomVersion(options); - builder.ConfigureFISVersion(options); - builder.ConfigureEstimatedSumVersion(options); - builder.ConfigureEstimatedInventoryVersion(options); - builder.ConfigureInventoryDetailVersion(options); - builder.ConfigureSecondaryAdjustmentVersion(options); - builder.ConfigureSecondaryPriceRatioVersion(options); - builder.ConfigureSecondaryDiscount(options); - builder.ConfigureSecondaryDiscountVersion(options); - builder.ConfigureSecondaryPriceRatioVersion(options); - //暂估发出未结算 - builder.ConfigureEstimatedStockDiffReport(options); - //暂估发出未结算明细 - builder.ConfigureEstimatedStockDiffReportDetail(options); - //库存未结算比对 - builder.ConfigureStockUnsettledDiffReport(options); - - //库存未结算比对明细 - builder.ConfigureStockUnsettledDiffReportDetail(options); - - - //R3结算数据对比输出表 - builder.ConfigureStockSettledDiffReport(options); - - //R3结算数据对比输出表明细 - builder.ConfigureStockSettledDiffReportDetail(options); - - //FIS发运数据对比输出表 - builder.ConfigureStockFisDiffReport(options); - - //FIS发运数据对比输出表明细 - builder.ConfigureStockFisDiffReportDetail(options); - - - //发出未结算比对 - builder.ConfigureSendUnsettledDiffReport(options); - - //发出未结算比对明细 - builder.ConfigureSendUnsettledDiffReportDetail(options); - - - //实际二配调整后输出表 - builder.ConfigureSecondaryActuralAdjustmentReport(options); - - //实际二配调整后输出表明细 - builder.ConfigureSecondaryActuralAdjustmentReportDetail(options); - - - //二配对比输出表 - builder.ConfigureSecondaryActuralDiffReport(options); - - //二配对比输出表明细 - builder.ConfigureSecondaryActuralDiffReportDetail(options); - - - - //轿车车序与看板差异输出表 - builder.ConfigureBTSeqKBDiffReport(options); - - //轿车车序与看板差异输出表明细 - builder.ConfigureBTSeqKBDiffReportDetail(options); - - //轿车发出未结算输出表 - builder.ConfigureBTNotConsignReport(options); - //轿车发出未结算输出表明细 - builder.ConfigureBTNotConsignReportDetail(options); - - - builder.ConfigureTaskJob(options); - builder.ConfigureImportMap(options); - - - - - builder.ConfigureInvoiceSettledDiff(options); - builder.ConfigureInventoryDetailVersion(options); - builder.ConfigureInvoiceSettledDiffVersion(options); - builder.ConfigurePriceListVersion(options); - builder.ConfigurePriceList(options); - builder.ConfigureFIS_TH(options); - builder.ConfigureMaterialRelationshipVersion(options); - builder.ConfigureMaterialRelationshipDetail(options); - builder.ConfigureSettlementPartVersion(options); - //结算关系对照表 - builder.ConfigureSettlementCrossReference(options); - builder.ConfigureSettlementCrossReferenceVersion(options); - //结算包和跟散件对应关系 - builder.ConfigureSettlementPakAndSpareParts(options); - builder.ConfigureSettlementPakAndSparePartsVersion(options); - - builder.ConfigureSecMatchBase(options); - builder.ConfigureWmsJitOutPutDetial(options); - #endregion - #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); - //红旗H平台 - builder.ConfigureHQH(options); - builder.ConfigureHQHVersion(options); //红旗主机场-未结明细-导入 builder.ConfigureUnHQSettleAccount(options); builder.ConfigureUnHQSettleAccountVersion(options); - - - - builder.ConfigureWmsJitOutPutDetail(options); - builder.ConfigureWmsJitOutPutVersion(options); - builder.ConfigureWmsJitOutPutDetail(options); - builder.ConfigureWmsJitOutPutVersion(options); - builder.ConfigureWmsKanbanOutPutVersion(options); - builder.ConfigureWmsKanbanOutPutDetail(options); - - //大众看板 - builder.ConfigureWmsWithOutKanbanOutPutVersion(options); - builder.ConfigureWmsWithOutKanbanOutPutDetail(options); - //大众备件-正常出库（有采购订单号） - builder.ConfigureWmsSharePartOutPutDetail(options); - builder.ConfigureWmsSharePartOutPutVersion(options); - //大众备件-数据调整（无采购订单号） - builder.ConfigureWmsSharePart90OutPutDetail(options); - builder.ConfigureWmsSharePart90OutPutVersion(options); - - builder.ConfigureWmsHQFKanbanOutPutVersion(options); - builder.ConfigureWmsHQFKanbanOutPutDetial(options); - builder.ConfigureWmsHQFSharePartOutPutVersion(options); - builder.ConfigureWmsHQFSharePartOutPutDetial(options); - builder.ConfigureWmsHQHKanbanOutPutVersion(options); - builder.ConfigureWmsHQHKanbanOutPutDetial(options); - builder.ConfigureWmsHQHSharePartOutPutVersion(options); - builder.ConfigureWmsHQHSharePartOutPutDetial(options); - - //M平台出库 - builder.ConfigureWmsHQMKanbanOutPutVersion(options); - builder.ConfigureWmsHQMKanbanOutPutDetial(options); - builder.ConfigureWmsHQMSharePartOutPutVersion(options); - builder.ConfigureWmsHQMSharePartOutPutDetial(options); - //一汽轿车出库 - builder.ConfigureWmsHQCarOutPutVersion(options); - builder.ConfigureWmsHQCarPutDetial(options); - builder.ConfigurePriceListVersionBJ(options); - builder.ConfigurePriceListBJ(options); - - builder.ConfigureWmsHQWithOutKanbanOutPutVersion(options); - builder.ConfigureWmsHQWithOutKanbanOutPutDetail(options); - - //一次性寄售销售库 - builder.ConfigureWmsOneTimeSaleOutPutVersion(options); - builder.ConfigureWmsOneTimeSaleOutPutDetial(options); + + builder.ConfigureWmsDetailReport(options); builder.ConfigureWmsDetailDiffReport(options); @@ -304,8 +90,7 @@ namespace Win.Sfs.SettleAccount //有条码 builder.ConfigureWmsDetailWithCodeReport(options); - builder.ConfigureWmsCustomerKanbanOutPut(options); - builder.ConfigureWmsCustomerKanbanOutPutDetial(options); + builder.ConfigureErrorBill(options); #endregion @@ -316,53 +101,7 @@ namespace Win.Sfs.SettleAccount #region 红旗M平台、一汽轿车 - /// - /// M平台-出库单 - /// - /// - /// - private static void ConfigureWmsHQMKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQMKanbanOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - /// - /// M平台出库详表 - /// - /// - /// - private static void ConfigureWmsHQMKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQMKanbanOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }); - }); - - } - + /// @@ -386,92 +125,6 @@ namespace Win.Sfs.SettleAccount b.HasIndex(x => new { x.CustomerMaterialCode,x.BillNum }); }); - } - - /// - /// 一汽轿车-出库单 - /// - /// - /// - private static void ConfigureWmsHQCarOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQCarOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - /// - /// 一汽轿车-出库详表 - /// - /// - /// - private static void ConfigureWmsHQCarPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQCarOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }); - }); - - } - - private static void ConfigureWmsHQMSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQMSharePartOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsHQMSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQMSharePartOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); - - //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }); - }); - } #endregion @@ -640,91 +293,6 @@ namespace Win.Sfs.SettleAccount // }); //} - - - - - /// - /// 准时化出库明细 - /// - /// - /// - private static void ConfigureWmsJitOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsJitOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.WmsBillNum).HasMaxLength(50).IsRequired(); - b.Property(x => x.Remark).HasMaxLength(200).IsRequired(); - b.Property(x => x.ParentMaterialCode).HasMaxLength(50).IsRequired(); - b.Property(x => x.MaterialCode).HasMaxLength(50).IsRequired(); - b.Property(x => x.MaterialGroup).HasMaxLength(200); - b.Property(x => x.OutPut).HasMaxLength(50); - b.Property(x => x.InPut).HasMaxLength(50); - b.Property(x => x.Extend1).HasMaxLength(50); - b.Property(x => x.Extend2).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.ChassisNumber).HasMaxLength(50); - b.Property(x => x.KennCode).HasMaxLength(50); - b.Property(x => x.MaterialDesc).HasMaxLength(50); - }); - } - - - - /// - /// 红旗工厂H平台验收结算明细-导入 - /// - /// - /// - private static void ConfigureHQH(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_HQ_H_Platform", options.Schema); - - b.ConfigureByConvention(); - //b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项 - b.Property(x => x.HQHKanBan).HasMaxLength(150);//有空的情况 - b.Property(x => x.MaterialVoucherNo).HasMaxLength(150); - b.Property(x => x.Factory).HasMaxLength(50); - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150); - b.Property(x => x.ExternalKanbanNumber).HasMaxLength(50); - b.Property(x => x.KanbanNumber).HasMaxLength(150); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.Supplier).HasMaxLength(50); - b.Property(x => x.StorageLocation).HasMaxLength(50); - b.Property(x => x.StorageLocationDesc).HasMaxLength(150); - b.Property(x => x.AcceptanceNo).HasMaxLength(50); - - //创建组合索引 - //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - private static void ConfigureHQHVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_HQ_H_PlatformVersion", 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); - }); - - } - - /// /// 红旗主机场-未结明细-导入 /// @@ -781,399 +349,63 @@ namespace Win.Sfs.SettleAccount } - - - - - /// - /// 大众备件发货 + /// 大众发票汇总导入 /// /// /// - private static void ConfigureWMSSparePart(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + private static void ConfigureInvoice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { - b.ToTable($"{options.TablePrefix}_WMSSparePart", options.Schema); + b.ToTable($"{options.TablePrefix}_Invoice", 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(500); - 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.Version,x.PurchaseOrderNo, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); + b.Property(x => x.Year).HasMaxLength(50); + b.Property(x => x.Period).HasMaxLength(50); + b.Property(x => x.Version).HasMaxLength(50); + b.Property(x => x.Factory).HasMaxLength(50); + b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空 + b.Property(x => x.MaterialDesc).HasMaxLength(50); + b.Property(x => x.Remark).HasMaxLength(1000); + }); } - - /// - /// 大众备件发货-版本 - /// - /// - /// - //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) + private static void ConfigureInvoiceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { - b.ToTable($"{options.TablePrefix}_WMSKanBanSettle", options.Schema); + b.ToTable($"{options.TablePrefix}_InvoiceVersion", options.Schema); b.ConfigureByConvention(); - b.Property(x => x.Kanban).IsRequired().HasMaxLength(150);//必填项 - b.Property(x => x.Relation).HasMaxLength(100); - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150); - b.Property(x => x.PartType).HasMaxLength(50); - - //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.Version,x.Kanban, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); + b.Property(x => x.Year).HasMaxLength(50); + b.Property(x => x.Period).HasMaxLength(50); + b.Property(x => x.Version).HasMaxLength(50); + b.Property(x => x.CustomerCode).HasMaxLength(50); + // b.Property(x => x.Factory).HasMaxLength(50); }); } + /// - /// 大众看板发货-版本 + /// 大众准时化结算明细导入 /// /// /// - private static void ConfigureWMSKanBanVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + private static void ConfigureSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) { - - builder.Entity(b => + 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); - }); - } - - /// - /// 大众看板结算明细导入表结构 - /// - /// - /// - private static void ConfigureKanBan(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_KanBanSettle", 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.Version, x.Kanban, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - private static void ConfigureKanBanVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_KanBanSettle_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 ConfigureInvoice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_Invoice", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空 - b.Property(x => x.MaterialDesc).HasMaxLength(50); - b.Property(x => x.Remark).HasMaxLength(1000); - - }); - } - /// - /// 大众发票汇总导入-版本 - /// - /// - /// - private static void ConfigureInvoiceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_InvoiceVersion", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - // b.Property(x => x.Factory).HasMaxLength(50); - - }); - } - - /// - /// CP7报废和索赔 - /// - /// - /// - private static void ConfigureScrapClaims(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_ScrapClaims", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.Type).IsRequired().HasMaxLength(50);//类型不能为空，否则区分不开报废还是索赔 - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空 - b.Property(x => x.MaterialDesc).HasMaxLength(50); - b.Property(x => x.Remark).HasMaxLength(1000); - - }); - } - - - - /// - /// CP7报废和索赔-版本 - /// - /// - /// - private static void ConfigureScrapClaimsVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_ScrapClaims_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 ConfigureSparePart(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_SparePart", 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); - b.Property(x => x.AmountNoTax); - 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).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.Version, x.PurchaseOrderNo, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - /// - /// 大众备件发票导入-版本 - /// - /// - /// - private static void ConfigureSparePartVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_SparePart_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); - }); - - } - /// - /// 大众FIS未结算明细导入 - /// - /// - /// - private static void ConfigureUnSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_Unsettle", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Qty).IsRequired(); - b.Property(x => x.Model).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.SettlementID).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.state }); - b.HasIndex(x => new { x.Version, x.ChassisNumber, x.MaterialCode,x.KENNCode }).IsUnique(); - }); - } - /// - /// 大众FIS未结算明细导入-版本 - /// - /// - /// - private static void ConfigureUnSettleAccountVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_Unsettle_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 ConfigureSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_Settle", options.Schema); + b.ToTable($"{options.TablePrefix}_Settle", options.Schema); b.ConfigureByConvention(); b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); @@ -1215,1791 +447,11 @@ namespace Win.Sfs.SettleAccount } - private static void ConfigureWmsJitOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsJitOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsJitOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsJitOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.KennCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ChassisNumber).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - - } - - private static void ConfigureWmsKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsKanbanOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsKanbanOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.BillNum}); - }); - } - private static void ConfigureWmsWithOutKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - //b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutExtend", options.Schema); - b.ToTable($"{options.TablePrefix}_WmsWithOutKanbanOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - } - private static void ConfigureWmsWithOutKanbanOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsWithOutKanbanOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.BillNum }); - }); - - } - - private static void ConfigureWmsHQWithOutKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQWithOutKanbanOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsHQWithOutKanbanOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - //b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutDetialExtend", options.Schema); - b.ToTable($"{options.TablePrefix}_WmsHQWithOutKanbanOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - - - - - - - - - - - - private static void ConfigureWmsSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsSharePartOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsSharePartOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsSharePartOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.BillNum }); - }); - - } - - /// - /// 大众备件0-90数据调整（无采购订单号） - /// - /// - /// - private static void ConfigureWmsSharePart90OutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsSharePart90OutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.BillNum }); - }); - - } - - private static void ConfigureWmsSharePart90OutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsSharePart90OutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - - - private static void ConfigureWmsHQFKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsHQFKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - - } - - private static void ConfigureWmsHQFSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsHQFSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); - - //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - - } - - private static void ConfigureWmsHQHKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsHQHKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - - } - - - - - - private static void ConfigureWmsCustomerKanbanOutPut(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsCustomerKanbanOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsCustomerKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsCustomerKanbanOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.SapMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - - } - - - - - - private static void ConfigureWmsHQHSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - private static void ConfigureWmsHQHSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); - - //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - - } - - - - - - - - private static void ConfigureWmsOneTimeSaleOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsOneTimeSaleOutPut", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.BillNum }); - }); - - } - - private static void ConfigureWmsOneTimeSaleOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_WmsOneTimeSaleOutPutDetial", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.WmsBillNum).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.SapMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.BillNum }); - }); - - } - - - - - - - - - - - #endregion - - #region 天合 - - private static void ConfigureHangfire(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"Job", "Hangfire"); - b.ConfigureByConvention(); - - }); - } - - private static void ConfigureSecMatchBase(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_SecMatchBase", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.Index).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - b.Property(x => x.Model).HasMaxLength(50); - b.Property(x => x.PartType).HasMaxLength(50); - b.Property(x => x.SettleMentPartCode).HasMaxLength(50); - b.Property(x => x.MaterialPartCode).HasMaxLength(50); - b.Property(x => x.MaterialDesc).HasMaxLength(50); - b.Property(x => x.SupplierCode).HasMaxLength(50); - b.Property(x => x.SupplierName).HasMaxLength(50); - b.Property(x => x.UsedNumber).HasMaxLength(50); - b.Property(x => x.SupplyProportion).HasMaxLength(50); - b.Property(x => x.Buyer).HasMaxLength(50); - b.Property(x => x.Remark).HasMaxLength(50); - b.Property(x => x.ConcurrencyStamp).HasMaxLength(50); - }); - } - - - private static void ConfigurePriceList(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_PriceList", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.MaterialCode).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - - }); - } - private static void ConfigurePriceListVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_PriceListVersion", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - - }); - } - private static void ConfigurePriceListBJ(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_PriceListBJ", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.MaterialCode).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - - }); - } - private static void ConfigurePriceListVersionBJ(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_PriceListVersionBJ", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - - }); - } - - - - - - - - //private static void ConfigureMaterialRelationshipVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - //{ - - // builder.Entity(b => - // { - - // b.ToTable($"{options.TablePrefix}_PriceListVersion", options.Schema); - - // b.ConfigureByConvention(); - // b.Property(x => x.Year).HasMaxLength(50); - // b.Property(x => x.Period).HasMaxLength(50); - // b.Property(x => x.Version).HasMaxLength(50); - // b.Property(x => x.Factory).HasMaxLength(50); - - // }); - //} - - - - - - - - private static void ConfigureInvoiceSettledDiff(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_InvoiceSettledDiff", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.MaterialCode).HasMaxLength(50); - - - }); - } - private static void ConfigureInvoiceSettledDiffVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_InvoiceSettledDiffVersion", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomCode).HasMaxLength(50); - b.Property(x => x.CustomName).HasMaxLength(50); - b.Property(x => x.CreatorName).HasMaxLength(50); - b.Property(x => x.ProjectName).HasMaxLength(50); - - }); - } - - private static void ConfigureTaskJob(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_TaskJob", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.Name).HasMaxLength(50); - b.Property(x => x.Creator).HasMaxLength(50); - b.Property(x => x.Email).HasMaxLength(50); - b.Property(x => x.ConcurrencyStamp).HasMaxLength(50); - b.Property(x => x.FileName).HasMaxLength(500); - b.Property(x => x.DownFileName).HasMaxLength(500); - b.Property(x => x.RealFileName).HasMaxLength(500); - b.Property(x => x.RealDownFileName).HasMaxLength(500); - }); - } - - private static void ConfigureBom(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_bom", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Factory).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ParentItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ChildItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Qty).IsRequired(); - b.Property(x => x.OperateProcess); - b.Property(x => x.ScrapPercent); - b.Property(x => x.BomType).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.EffectiveTime); - b.Property(x => x.ExpireTime); - b.Property(x => x.IssuePosition); - b.Property(x => x.BomLevel); - - b.Property(x => x.Enabled); - - b.HasIndex(x => new { x.ParentItemCode, x.ChildItemCode,x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - private static void ConfigureSettlementPart(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_settlement_part", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Factory).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.SettlementPartCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.Enabled); - - b.HasIndex(x => new { x.Period, x.CustomerCode, x.Version, x.SettlementPartCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureItemInvoicePrice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_item_invoice_price", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.Factory).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.Enabled); - - b.HasIndex(x => new { x.Period,x.Version, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureItemInvoicePriceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_item_invoice_price_version", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - - }); - } - - - - private static void ConfigureSupplierItemSetUp(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_supplier_item_setup", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.ErpSupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ErpItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerSupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.ErpSupplierCode, x.ErpItemCode, x.CustomerSupplierCode,x.CustomerCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureCustomerBom(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_customer_bom", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.Property(x => x.ParentItemCode).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.Property(x => x.ChildItemCode).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.Property(x => x.Qty); - b.Property(x => x.EffectiveTime); - b.Property(x => x.FailureTime); - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.CustomerCode, x.ParentItemCode, x.ChildItemCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureCustomer(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_customer", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Code).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.BranchId, x.Code }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - - - private static void ConfigureEstimatedInventoryDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_estdetail", options.Schema); - b.ConfigureByConvention(); - - - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialDocument).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.PurchaseDocument).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.PurchaseLine).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ReceiveQty).IsRequired(); - b.Property(x => x.InvoiceQty).IsRequired(); - b.Property(x => x.SupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.PostingDate).IsRequired(); - - - - - b.Property(x => x.StorageLocation).IsRequired(); - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.MaterialDocument, x.MaterialDocumentLine, x.MaterialCode, x.Version }).IsUnique(); - // b.HasIndex(x => new { x.BranchId, x.ParentItemCode, x.ChildItemCode, x.EffectiveTime, x.ExpireTime }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - private static void ConfigureInventoryDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_inventory", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.EndingInventoryQty).IsRequired(); - b.Property(x => x.InputQty).IsRequired(); - b.Property(x => x.OutputQty).IsRequired(); - b.Property(x => x.Price); - b.Property(x => x.StorageLocation).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Unit).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.AppraisalCategory).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new {x.Version, x.MaterialCode, x.StorageLocation }).IsUnique().HasFilter(IsDeletedFilter); - - - }); - } - private static void ConfigureEstimatedSum(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_estsum", options.Schema); - b.ConfigureByConvention(); - - - - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Postingperiod).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Qty).IsRequired(); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - - - - }); - } - - private static void ConfigureCodeSetting(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_code", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Project).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Value).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.Project,x.Value}).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureMaterial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_material", options.Schema); - b.ConfigureByConvention(); - - - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.EstimateType).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Unit).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - - - }); - } - - - - private static void ConfigureMaterialRelationship(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_relationship", options.Schema); - b.ConfigureByConvention(); - - - - - //b.Property(x => x.SettleMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialProperty).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - //b.Property(x => x.ShipMaterailCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ErpMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.ErpMaterialCode }); - - b.HasIndex(x => new { x.ErpMaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - - - }); - } - - - private static void ConfigureFIS(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_fis", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Model).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.KENNCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Qty).IsRequired(); - b.Property(x=>x.ChassisNumber2).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x =>x.ErpMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.ChassisNumber2, x.Version, x.KENNCode, x.ItemCode }); - b.HasIndex(x => new { x.ChassisNumber2, x.KENNCode }); - - }); - } - - private static void ConfigureFIS_TH(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_fis_th", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ErpMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Qty).IsRequired(); - b.HasIndex(x => new { x.ChassisNumber2, x.Version, x.Model, x.MaterialCode }).IsUnique(); - - - }); - } - - - - - private static void ConfigureFISExtend(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - // ChassisNumber2_Version_Model_ItemCode - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_fis_extend", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Model).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ChassisNumber2).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OrderBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.ItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Qty).IsRequired(); - - - b.HasIndex(x => new { x.ChassisNumber2, x.Version,x.Model,x.ItemCode }).IsUnique(); - - - - - }); - } - - - - private static void ConfigureBomVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_bom_version", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); - }); - } - - - - private static void ConfigureEstimatedSumVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_estsum_verion", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); - }); - - - - } - private static void ConfigureEstimatedInventoryVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_estinventory_version", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); - }); - - - } - - private static void ConfigureEstimatedStockDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_estimate_stock_report", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - - b.HasMany(u => u.EstimatedStockDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - - - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureEstimatedStockDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_estimate_stock_report_detail", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - - - private static void ConfigureStockUnsettledDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_stock_unsettled_report", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - - b.HasMany(u => u.StockUnsettledDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - - - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureStockUnsettledDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_stock_unsettled_report_detail", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - private static void ConfigureStockSettledDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_stock_settled_report", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - - b.HasMany(u => u.StockSettledDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - - - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureStockSettledDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_stock_settled_report_detail", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - - private static void ConfigureStockFisDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_stock_fis_diff_report", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - - b.HasMany(u => u.StockFisDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - - - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureStockFisDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_stock_fis_diff_report_detail", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - - - private static void ConfigureSendUnsettledDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_send_unsettled_report", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - - //b.HasMany(u => u.SendUnsettledDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - - - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureSendUnsettledDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_send_unsettled_report_detail", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.ChassisNumber, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureSecondaryActuralAdjustmentReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_act_adjustment_report", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.Property(x => x.Enabled); - b.HasMany(u => u.SecondaryActuralAdjustmentReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureSecondaryActuralAdjustmentReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_act_adjustment_report_detail", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.CustomItemCode, x.CustomSubItemCode, x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - - - private static void ConfigureSecondaryActuralDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_act_diff_report", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.Property(x => x.Enabled); - b.HasMany(u => u.SecondaryActuralDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureSecondaryActuralDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_act_diff_report_detail", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.CustomItemCode, x.CustomSubItemCode, x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureInventoryDetailVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_inventory_version", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new {x.Version,x.Factory }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - - - private static void ConfigureFISVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_fis_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); - }); - } - - private static void ConfigurePrebatch(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_prebatch", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.YearKennCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CarCode).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.State).IsRequired(); - // b.HasIndex(x => new { x.KENNCode, x.Year}).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - - private static void ConfigureCentralizedControl(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_control", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Year, x.Period }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureSecondaryAdjustment(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_adj", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerComponentCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version ,x.CustomerComponentCode,x.CustomerMaterialCode,x.SupplierCode}).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - - private static void ConfigureSecondaryDiscount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_dis", options.Schema); - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.SupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - - - - - - private static void ConfigureSecondaryPriceRatio(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_ratio", 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.CustomItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomItemPrice).IsRequired(); - b.HasIndex(x => new { x.Version, x.CustomItemCode, x.CustomSubItemCode,x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - - - } - - - - - private static void ConfigureSecondaryAdjustmentVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_sec_adj_version", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - - b.HasIndex(x => new { x.Version}).IsUnique().HasFilter(IsDeletedFilter); - - - - }); - - - } - - private static void ConfigureSecondaryDiscountVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_sec_dis_version", 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).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - - - - }); - - - } - - private static void ConfigureSecondaryPriceRatioVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_sec_ratio_version", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Year).IsRequired(); - b.Property(x => x.Period).IsRequired(); - - b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); - }); - - - } - private static void ConfigureCustomerStorageLocation(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_customerlocation", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Storagelocation).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.CustomerDesc).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new { x.Storagelocation,x.CustomerCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - private static void ConfigureFactory(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_factory", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Code).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.Desc).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.HasIndex(x => new {x.Code }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureBTSeqKBDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_bt_seq_kb_diff_report", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - - b.HasMany(u => u.BTSeqKBDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - - - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - - private static void ConfigureBTSeqKBDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_bt_seq_kb_diff_report_detail", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.DT, x.CustomCode,x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - private static void ConfigureBTNotConsignReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_bt_not_kb_consign_report", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - - b.HasMany(u => u.BTNotConsignReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired(); - - - b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - private static void ConfigureBTNotConsignReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_bt_not_kb_consign_report_detail", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength); - - b.Property(x => x.Enabled); - b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.CustomCode, x.MaterialCode,x.OrderKBCode }).IsUnique().HasFilter(IsDeletedFilter); - - }); - } - - - - private static void ConfigureImportMap(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - b.ToTable($"{options.TablePrefix}_importmap", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.NewColumnName).HasMaxLength(CommonConsts.MaxCodeLength); - b.Property(x => x.OldColumnName).HasMaxLength(CommonConsts.MaxCodeLength); - - b.Property(x => x.ProjectName).HasMaxLength(CommonConsts.MaxCodeLength); - - }); - } - - - - - - private static void ConfigureSettlementPartVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_settlement_part_version", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - - }); - } - - - - - - - - - - private static void ConfigureMaterialRelationshipDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_MaterialRelationshipDetail", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - b.Property(x => x.ErpMaterialCode).HasMaxLength(50); - b.Property(x => x.MaterialDesc).HasMaxLength(50); - b.Property(x => x.MaterialProperty).HasMaxLength(50); - b.Property(x => x.SettleMaterialCode).HasMaxLength(50); - b.Property(x => x.ShipMaterailCode).HasMaxLength(50); - b.Property(x => x.AppraisalCategory).HasMaxLength(50); - b.Property(x => x.Remark).HasMaxLength(50); - b.Property(x => x.ConcurrencyStamp).HasMaxLength(50); - }); - } - - - private static void ConfigureMaterialRelationshipVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_MaterialRelationshipVersion", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - b.Property(x => x.Remark).HasMaxLength(50); - b.Property(x => x.ConcurrencyStamp).HasMaxLength(50); - }); - } - - - /// - /// 结算关系对照表 - /// - /// - /// - private static void ConfigureSettlementCrossReference(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_SettlementCrossReference", options.Schema); - b.ConfigureByConvention(); - - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - b.Property(x => x.Model).HasMaxLength(50); - b.Property(x => x.PartType).HasMaxLength(50); - b.Property(x => x.SettlementMaterialCode).IsRequired().HasMaxLength(50); - b.Property(x => x.BomMaterialCode).IsRequired().HasMaxLength(50); - b.Property(x => x.MaterialDesc).HasMaxLength(50); - b.Property(x => x.SupplierCode).HasMaxLength(50); - b.Property(x => x.SupplierDesc).HasMaxLength(128); - b.Property(x => x.Buyer).HasMaxLength(50); - b.Property(x => x.Version).IsRequired().HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - - b.HasIndex(x => new { x.Version, x.SettlementMaterialCode, x.BomMaterialCode }).IsUnique().HasFilter(IsDeletedFilter); - }); - } - - /// - /// 结算关系对照表_Version - /// - /// - /// - private static void ConfigureSettlementCrossReferenceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_SettlementCrossReference_Version", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - - }); - } - - /// - /// 结算包跟散件对应关系 - /// - /// - /// - private static void ConfigureSettlementPakAndSpareParts(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_SettlementPakAndSpareParts", options.Schema); - - - b.ConfigureByConvention(); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.ApplicableFunction).HasMaxLength(50); - b.Property(x => x.SettlementPartCode).HasMaxLength(50); - b.Property(x => x.SettlementPartDesc).HasMaxLength(50); - b.Property(x => x.ErpSparePartCode).HasMaxLength(50); - b.Property(x => x.ErpSparePartName).HasMaxLength(50); - b.Property(x => x.PartType).HasMaxLength(50); - b.Property(x => x.QADCode).HasMaxLength(50); - b.Property(x => x.SupplierCode).HasMaxLength(50); - b.Property(x => x.SupplierName).HasMaxLength(50); - b.Property(x => x.ProductLine).HasMaxLength(50); - b.Property(x => x.PerCarNum).HasMaxLength(50); - b.Property(x => x.Price).HasMaxLength(50); - b.Property(x => x.SupplyProportion).HasMaxLength(50); - b.Property(x => x.QuantityPrice).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - }); - } - - /// - /// 结算包跟散件对应关系_Version - /// - /// - /// - private static void ConfigureSettlementPakAndSparePartsVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) - { - - builder.Entity(b => - { - - b.ToTable($"{options.TablePrefix}_SettlementPakAndSpareParts_Version", options.Schema); - - b.ConfigureByConvention(); - b.Property(x => x.Year).HasMaxLength(50); - b.Property(x => x.Period).HasMaxLength(50); - b.Property(x => x.Version).HasMaxLength(50); - b.Property(x => x.CustomerCode).HasMaxLength(50); - b.Property(x => x.Factory).HasMaxLength(50); - - }); - } #endregion } @@ -3007,4 +459,3 @@ namespace Win.Sfs.SettleAccount -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs index 3ca15628..54fd185a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs @@ -55,12 +55,6 @@ namespace Win.Sfs.SettleAccount //options.AddDefaultRepositories(includeAllEntities: true); }); - context.Services.AddAbpDbContext(options => - { - options.AddDefaultRepositories(); - - - }); context.Services.AddAbpDbContext(options => { @@ -74,7 +68,6 @@ namespace Win.Sfs.SettleAccount // context.Services.AddTransient(typeof(IInventoryDetailRepository), //typeof(InventoryDetailRepository)); context.Services.AddTransient(typeof(UnInterfaceEfCoreRepository<>)); - context.Services.AddTransient(typeof(WMSEfCoreRepository<>)); context.Services.AddTransient(typeof(INormalEfCoreRepository<,>), typeof(SettleAccountNormalEfCoreRepository<,>)); context.Services.AddTransient(typeof(IBranchEfCoreRepository<,>), diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs index f3969393..f37664c1 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs @@ -9,8 +9,7 @@ using System.Threading.Tasks; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Win.Sfs.SettleAccount.Entities; -using Win.Sfs.SettleAccount.Entities.WMS; -using WY.NewJit.Extends.PaiGe.WMS; + namespace Win.Sfs.SettleAccount.EntityFrameworkCore diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs deleted file mode 100644 index 7cb3f3eb..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs +++ /dev/null @@ -1,128 +0,0 @@ -using Dapper; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Repositories.Dapper; -using Volo.Abp.EntityFrameworkCore; - - - -namespace Win.Sfs.SettleAccount -{ - public class WMSDapperRepository : DapperRepository, ITransientDependency - { - - - public WMSDapperRepository(IDbContextProvider dbContextProvider) - : base(dbContextProvider) - { - - } - - public virtual async Task> GetListBySqlAsync(string sql, bool isTrans = false) - { - if (isTrans) - { - IDbConnection conn = await GetDbConnectionAsync(); - IDbTransaction trans = await GetDbTransactionAsync(); - return (await conn.QueryAsync(sql, null, trans)) - .ToList(); - } - else - { - IDbConnection conn = await GetDbConnectionAsync(); - return (await conn.QueryAsync(sql)) - .ToList(); - } - } - - public virtual async Task GetSingleBySqlAsync(string sql, bool isTrans = false) - { - if (isTrans) - { - IDbConnection conn = await GetDbConnectionAsync(); - IDbTransaction trans = await GetDbTransactionAsync(); - return await conn.QuerySingleOrDefaultAsync(sql, null, trans); - } - else - { - IDbConnection conn = await GetDbConnectionAsync(); - return await conn.QuerySingleOrDefaultAsync(sql); - } - } - - - public virtual async Task ExecuteSqlAsync(string sql, object obj = null, bool isTrans = false) - { - if (isTrans) - { - //return await DbConnection.ExecuteAsync("update People set Name = @NewName", new { NewName = name }, DbTransaction); - IDbConnection conn = await GetDbConnectionAsync(); - IDbTransaction trans = await GetDbTransactionAsync(); - return await conn.ExecuteAsync(sql, obj, trans); - } - else - { - //return await DbConnection.ExecuteAsync("update People set Name = @NewName", new { NewName = name }, DbTransaction); - IDbConnection conn = await GetDbConnectionAsync(); - return await conn.ExecuteAsync(sql, obj); - } - } - - - #region 同步方法 - public virtual List GetListBySql(string sql, bool isTrans = false) - { - if (isTrans) - { - IDbConnection conn = GetDbConnectionAsync().GetAwaiter().GetResult(); - IDbTransaction trans = GetDbTransactionAsync().GetAwaiter().GetResult(); - return (conn.Query(sql, null, trans)) - .ToList(); - } - else - { - IDbConnection conn = (IDbConnection)GetDbConnectionAsync().GetAwaiter().GetResult(); - return (conn.Query(sql)) - .ToList(); - } - } - - public virtual T GetSingleBySql(string sql, bool isTrans = false) - { - if (isTrans) - { - IDbConnection conn = GetDbConnectionAsync().GetAwaiter().GetResult(); - IDbTransaction trans = GetDbTransactionAsync().GetAwaiter().GetResult(); - return conn.QuerySingleOrDefault(sql, null, trans); - } - else - { - IDbConnection conn = (IDbConnection)GetDbConnectionAsync().GetAwaiter().GetResult(); - return conn.QuerySingleOrDefault(sql); - } - } - - - public virtual int ExecuteSql(string sql, object obj = null, bool isTrans = false) - { - if (isTrans) - { - IDbConnection conn = GetDbConnectionAsync().GetAwaiter().GetResult(); - IDbTransaction trans = GetDbTransactionAsync().GetAwaiter().GetResult(); - return conn.Execute(sql, obj, trans); - } - else - { - IDbConnection conn = (IDbConnection)GetDbConnectionAsync().GetAwaiter().GetResult(); - return conn.Execute(sql, obj); - } - } - - #endregion - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs deleted file mode 100644 index ce476740..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs +++ /dev/null @@ -1,48 +0,0 @@ - -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.Data; -using Volo.Abp.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities; -using Win.Sfs.SettleAccount.Entities.WMS; -using WY.NewJit.Extends.PaiGe.WMS; - -namespace Win.Sfs.SettleAccount -{ - - - - - [ConnectionStringName("Wms")] - public class WMSDbContext : AbpDbContext - { - - - /* Add DbSet properties for your Aggregate Roots / Entities here. - * Also map them inside NewJitDbContextModelCreatingExtensions.ConfigureNewJit - */ - - public WMSDbContext(DbContextOptions options) - : base(options) - { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(30)); - } - - - - protected override void OnModelCreating(ModelBuilder builder) - { - base.OnModelCreating(builder); - - - } - - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs index 959c7e4e..be303a03 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs @@ -56,257 +56,4 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report [ExporterHeader(DisplayName ="单号")] public string REMARK { set; get; } } - - - public class ErpSumOutputDapperRepository: DapperRepository, ITransientDependency - { - - public ErpSumOutputDapperRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - - } - public virtual List GetTask(string version,string begin, string end) - { - var str = ""; - - if (!string.IsNullOrEmpty(begin)) - { - str += string.Format(" and AccountDate>='{0}' ", begin); - } - if (!string.IsNullOrEmpty(end)) - { - str += string.Format(" and AccountDate<='{0}' ", end); - } - if (!string.IsNullOrEmpty(begin)) - { - str += string.Format(" and JsonString='{0}' ", version); - } - var sql = "SELECT TOP (1000) [wms_seq]\n" + - " ,[wms_table]\n" + - " ,[wms_table_qty]\n" + - " ,[wms_state]\n" + - " ,[remark]\n" + - " ,[createtime]\n" + - " ,[wms_domin]\n" + - " ,[SourceBillNum]\n" + - " ,[updatetime]\n" + - " ,[wms_uid]\n" + - " ,[JsonString]\n" + - " ,[AccountDate]\n" + - " FROM [TA_WMS_CTRL] WHERE {0}" + - " SourceBillNum LIKE 'S2%' order by createtime desc"; - - sql = string.Format(sql, str); - var query = DbConnection.Query(sql); - return query.ToList(); - - - - } - - public virtual List GetTaskList(string taskid, string materialCode, string billnum) - { - var str = " where 1=1 "; - - if (!string.IsNullOrEmpty(taskid)) - { - str += string.Format(" and wms_seq='{0}' ", taskid); - } - if (!string.IsNullOrEmpty(materialCode)) - { - str += string.Format(" and ZVBELN='{0}' ", billnum); - } - if (!string.IsNullOrEmpty(billnum)) - { - str += string.Format(" and MATNR='{0}' ", materialCode); - } - - var sql = - " SELECT [wms_seq]\n" + - " ,[POSNR]\n" + - " ,[ZVBELN] \n" + - " ,[KUNNR] \n" + - " ,[AUGRU]\n" + - " ,[MATNR]\n" + - " ,[ZPR0]\n" + - " ,[KWMENG]\n" + - " ,[ZNOTE1]\n" + - " ,[ZNOTE4]\n" + - " ,[ZNOTE5]\n" + - " ,[STATE]\n" + - " ,[REMARK]\n" + - " FROM [TA_WMS_JSKH] {0} "; - - sql = string.Format(sql, str); - var query = DbConnection.Query(sql); - return query.ToList(); - - - - } - - - - public virtual List GetVersionList() - { - - - var sql = - " SELECT \n" + - " distinct [JsonString]\n" + - - " FROM [TA_WMS_CTRL] WHERE " + - " SourceBillNum LIKE 'S2%' "; - - - var query = DbConnection.Query(sql); - return query.ToList(); - - - - } - - [UnitOfWork(false)] - - - public virtual void InsertWmsSum(List p_list,string version,DateTime accountDate) - { - StringBuilder _buffer = new StringBuilder(); - - var _ary=p_list.Select(p => p.BillNum).Distinct().ToList(); - - var billnum= string.Join(",", _ary); - - - //var billnum ="S" +DateTime.Now.ToString("yyyyMMddhhmmss"); - var taskid = Guid.NewGuid().ToString(); - foreach (var itm in p_list) - { - - var sql = "INSERT INTO [dbo].[TA_WMS_JSKH]\n" + - " ([wms_seq]\n" + - " ,[POSNR]\n" + - " ,[ZVBELN]\n" + - " ,[AUART]\n" + - " ,[VKORG]\n" + - " ,[SPART]\n" + - " ,[VTWEG]\n" + - " ,[KUNNR]\n" + - " ,[KUNNR2]\n" + - " ,[AUGRU]\n" + - " ,[MATNR]\n" + - " ,[WERKS]\n" + - " ,[LGORT]\n" + - " ,[ZPR0]\n" + - " ,[KWMENG]\n" + - " ,[ZNOTE1]\n" + - " ,[ZNOTE2]\n" + - " ,[ZNOTE3]\n" + - " ,[ZNOTE4]\n" + - " ,[ZNOTE5]\n" + - " ,[STATE]\n" + - " ,[REMARK]" + - " ,[KOEIN] )\n" + - " VALUES\n" + - " ( '{0}' ,\n" + - " '{1}' , \n" + - " '{2}' , \n" + - " '{3}' , \n" + - " '{4}' , \n" + - " '{5}' , \n" + - " '{6}' , \n" + - " '{7}' , \n" + - " '{8}' , \n" + - " '{9}' , \n" + - " '{10}' , \n" + - " '{11}' , \n" + - " '{12}' , \n" + - " '{13}' , \n" + - " '{14}' , \n" + - " '{15}' , \n" + - " '{16}' , \n" + - " '{17}' , \n" + - " '{18}' , \n" + - " '{19}' , \n" + - " {20} , \n" + - " '{21}' , '{22}' ) \n"; - - sql = string.Format(sql, - taskid, - itm.LineNumber.ToString(), - itm.BillNum, - "ZKE1", - "1001", - "00", - itm.SaleCode, - itm.ClientCode, - itm.ClientCode, - itm.SettleCode, - itm.MaterialCode, - "1000", - string.Empty, - itm.Price, - itm.OutputQty, - itm.Client, - itm.MaterialGroupCode, - itm.MaterialGroup, - itm.Type, - itm.OutPutAmt, - "0", - "", - "CNY" - - ); - _buffer.AppendLine(sql); - } - - - - var count= DbConnection.Execute(_buffer.ToString(), null, null, 1200, null); - if (count > 0) - { - var sql = "INSERT INTO [TA_WMS_CTRL]\n" + - " ([wms_seq]\n" + - " ,[wms_table]\n" + - " ,[wms_table_qty]\n" + - " ,[wms_state]\n" + - " ,[remark]\n" + - " ,[createtime]\n" + - " ,[wms_domin]\n" + - " ,[SourceBillNum]\n" + - " ,[JsonString]\n" + - " ,[AccountDate])\n" + - " VALUES\n" + - " ( '{0}' \n" + - " , '{1}' \n" + - " , '{2}' \n" + - " , '{3}' \n" + - " , '{4}' \n" + - " , '{5}' \n" + - " , '{6}' \n" + - " , '{7}' \n" + - " , '{8}' \n" + - " , '{9}' )"; - - sql = string.Format(sql, - taskid - , "TA_WMS_JSKH" - , count.ToString(), - 0, - string.Empty, - DateTime.Now, - "1000", - billnum - , version - , accountDate.ToString("yyyy-MM-dd") - - ) ; - - DbConnection.Execute(sql, null, null, 1200, null); - } - - - - } - } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs index 57fe5927..5dc6644d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs @@ -10,7 +10,6 @@ using Volo.Abp.Domain.Repositories.Dapper; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; using Win.Sfs.SettleAccount.Entities.SecMatch; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef; namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs index 41e11874..968a0c02 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories.Dapper; using Volo.Abp.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs; namespace Win.Sfs.SettleAccount.Repository.Report { @@ -18,131 +17,5 @@ namespace Win.Sfs.SettleAccount.Repository.Report : base(dbContextProvider) { } - - public virtual List GetDiffReport(string year, string customcode, string version) - { - - string sqlString = "SELECT\n" + -"t1.ErpMaterialCode,\n" + -"t1.Price SumPrice,\n" + -"t2.Price,\n" + -"t3.MaterialDesc,\n" + -"t3.EstimateTypeDesc ,\n" + -"(ISNULL(t1.price,0)-ISNULL(t2.price,0)) DiffPrice\n" + -"FROM\n" + -"(\n" + -"SELECT\n" + -"ErpMaterialCode,\n" + -"SUM( amt ) Price\n" + -"FROM\n" + -"(\n" + -"SELECT\n" + -"ErpMaterialCode,\n" + -"SettleMaterialCode,(\n" + -"Qty * isnull( b.Price, 0 )) amt\n" + -"FROM\n" + -"(\n" + -"\n" + -"select MaterialCode,ErpMaterialCode,Qty,SettleMaterialCode from\n" + -"Set_MaterialRelationshipDetail_pg ab inner join Set_material ac\n" + -"on ab.SettleMaterialCode=ac.CustomerPartCode\n" + -") a\n" + -"LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) b ON a.MaterialCode = b.MaterialCode\n" + -") temp1\n" + -"GROUP BY\n" + -"ErpMaterialCode\n" + -") t1\n" + -"LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) t2 ON t1.ErpMaterialCode = t2.MaterialCode\n" + -"LEFT JOIN ( SELECT max( Id ) Id, MaterialCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc ) t3 ON t1.ErpMaterialCode = t3.MaterialCode;\n"; - - -// string sqlString = "SELECT\n" + -//" t1.ErpMaterialCode,\n" + -//" t1.Price SumPrice,\n" + -//" t2.Price,\n" + -//" t3.MaterialDesc,\n" + -//" t3.EstimateTypeDesc ,\n" + - -//" (ISNULL(t1.price,0)-ISNULL(t2.price,0)) DiffPrice\n" + - -//"FROM\n" + -//" (\n" + -//" SELECT\n" + -//" ErpMaterialCode,\n" + -//" SUM( amt ) Price \n" + -//" FROM\n" + -//" (\n" + -//" SELECT\n" + -//" ErpMaterialCode,\n" + -//" SettleMaterialCode,(\n" + -//" Qty * isnull( b.Price, 0 )) amt \n" + -//" FROM\n" + -//" Set_MaterialRelationshipDetail_pg a\n" + -//" LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) b ON a.SettleMaterialCode = b.MaterialCode \n" + -//" ) temp1 \n" + -//" GROUP BY\n" + -//" ErpMaterialCode \n" + -//" ) t1\n" + -//" LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) t2 ON t1.ErpMaterialCode = t2.MaterialCode\n" + -//" LEFT JOIN ( SELECT max( Id ) Id, MaterialCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc ) t3 ON t1.ErpMaterialCode = t3.MaterialCode"; - - string _sql = string.Format(sqlString, version, customcode); - - var _query = DbConnection.Query(_sql,null,null,true,1200,null); - //var _query = _db.Query(); - return _query.ToList(); - } - - public virtual List GetDiffDetailReport(string year, string customcode, string version) - { - string sqlString = - -"select\n" + -"a.ErpMaterialCode,\n" + -"isnull(d.materialCode,\n" + -"SettleMaterialCode) MaterialCode,\n" + -"a.SettleMaterialCode,\n" + -"d.MaterialDesc,\n" + -"d.EstimateTypeDesc\n" + -"from\n" + -"(\n" + -"select\n" + -"MaterialCode,\n" + -"ErpMaterialCode,\n" + -"Qty,\n" + -"SettleMaterialCode\n" + -"from\n" + -"Set_MaterialRelationshipDetail_pg ab\n" + -"inner join Set_material ac\n" + -"on\n" + -"ab.SettleMaterialCode = ac.CustomerPartCode) a\n" + -"left join\n" + -"(\n" + -"SELECT\n" + -"Price,\n" + -"MaterialCode\n" + -"FROM\n" + -"Set_PriceList\n" + -"WHERE\n" + -"version = (\n" + -"SELECT\n" + -"Max(Version)\n" + -"FROM\n" + -"Set_PriceList )\n" + -"and type = 10 )\n" + -"b on\n" + -"a.SettleMaterialCode = b.MaterialCode\n" + -"left join\n" + -"set_material d ON\n" + -"a.SettleMaterialCode = d.CustomerPartCode\n" + -"where\n" + -"b.MaterialCode is null\n"; - string _sql = string.Format(sqlString, version, customcode); - var _query = DbConnection.Query(_sql, null, null, true, 1200, null); - //var _query = _db.Query(); - return _query.ToList(); - } - - } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs index b58be080..ea9ef760 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs @@ -52,120 +52,4 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report public decimal Qty { set; get; } } - /// - /// 主数据Dapper表 - /// - public class WmsDapperRepository : DapperRepository, ITransientDependency - { - public WmsDapperRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - - } - - - public virtual List GetSalesStock() - { - string str = " select SUM(Qty) Qty,PartCode SapCode from TS_STOCK_DETAIL where AreaCode='SALE' group by PartCode "; - - var _list = DbConnection.Query(str); - return _list.ToList(); - - - } - - - - public virtual List GetSalesStock(string locCode) - { - string str = " select SUM(Qty) Qty,PartCode SapCode from TS_STOCK_DETAIL where AreaCode='SALE' and LocCode='{0}' group by PartCode "; - str=string.Format(str, locCode); - - var _list = DbConnection.Query(str); - return _list.ToList(); - - - } - - - - public virtual List GetSalesStockSum(string version) - { - // string str = - // "SELECT A\n" + - //" .*,\n" + - //" B.PartDesc,\n" + - //" B.PartGroup \n" + - //"FROM\n" + - //" TM_PG_TIME_STOCK_DETAIL\n" + - //" A LEFT JOIN (\n" + - //" SELECT DISTINCT\n" + - //" [ PartCode ],\n" + - //" ( ISNULL ( [ PartDesc1 ], '' ) + ISNULL ( [ PartDesc2 ], '' ) ) PartDesc,\n" + - //" PartGroup \n" + - //" FROM\n" + - //" [ VIEW_PG_SIMPLE_PART ] \n" + - //" ) B ON A.PartCode = B.PartCode where a.version='{0}'"; - string str = " SELECT A.*, \n" + -" B.PartDesc, \n" + -" B.PartGroup, \n" + -" B.PartGroupDesc \n" + -" FROM \n" + -" TM_PG_TIME_STOCK_DETAIL \n" + -" A LEFT JOIN ( \n" + -" SELECT DISTINCT \n" + -" PartCode, \n" + -" ( ISNULL ( [PartDesc1], '' ) + ISNULL ( [PartDesc2], '' ) ) PartDesc, \n" + -" PartGroup ,PartGroupDesc\n" + - - -" FROM \n" + -" VIEW_PG_SIMPLE_PART \n" + -" ) B ON A.PartCode = B.PartCode where a.version='{0}'"; - str = string.Format(str, version); - var _list = DbConnection.Query(str); - return _list.ToList(); - - - } - - - - //public virtual Dictionary GetSapList(List childList, string version, bool isNotHistoryPart = false) where T : ReportDetailBase, new() - //{ - - // return tmpList; - //} - //public virtual List GetErpPartCodePriceList(string version) - //{ - // string str = "SELECT\n" + - // " ErpMaterialCode SapErpPartCode,\n" + - // " SUM( PRICE ) SapPrice \n" + - // " FROM \n" + - // " Set_MaterialRelationshipDetail A\n" + - // " LEFT JOIN ( SELECT SUM( AMT )/ SUM( Qty ) PRICE, MaterialCode FROM Set_Invoice WHERE VERSION = '{0}' GROUP BY MaterialCode ) B ON A.SettleMaterialCode = B.MaterialCode \n" + - // "GROUP BY\n" + - // " ErpMaterialCode"; - - // var _list = DbConnection.Query(string.Format(str, version)); - // return _list.ToList(); - //} - //public virtual List GetSettleInvoiceDiff(string version) - //{ - // var str = "SELECT\n" + - // " * \n" + - // " FROM\n" + - // " (\n" + - // " SELECT\n" + - // " b.MaterialCode,\n" + - // " InvocieQty-SettleQty DiffQty \n" + - // " FROM\n" + - // " ( SELECT sum( Qty ) SettleQty, MaterialCode FROM Set_Settle a WHERE version = '{0}' GROUP BY MaterialCode ) a\n" + - // " INNER JOIN ( SELECT SUM( QTY ) InvocieQty, MaterialCode FROM Set_Invoice WHERE version = '{0}' GROUP BY MaterialCode ) b ON a.MaterialCode = b.MaterialCode \n" + - // " ) temp \n" + - // " WHERE\n" + - // " temp.DiffQty <>0"; - // var _list = DbConnection.Query(string.Format(str, version)); - // return _list.ToList(); - //} - } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs deleted file mode 100644 index 244850c5..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs +++ /dev/null @@ -1,71 +0,0 @@ -using EFCore.BulkExtensions; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef; - -namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.SettlementPakAndSparePartsRef -{ - public class SettlementPakAndSparePartRepository: EfCoreRepository, ITransientDependency - { - public SettlementPakAndSparePartRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - - } - public virtual bool Delete(string version, string customerCode) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - var _detailQuery = DbSet.Where(p => p.Version == version && p.CustomerCode == customerCode); - _detailQuery.BatchDelete(); - } - catch (Exception e) - { - throw e; - } - return true; - } - - public virtual List GetDetail(string version, string customerCode) - { - var list = GetQueryable().Where(p => p.Version == version && p.CustomerCode == customerCode).ToList(); - return list; - } - - public virtual bool DelDetailByErpPartCode(string version, List settleCodeList) - { - var query = GetQueryable().Where(p => p.Version == version && settleCodeList.Contains(p.ErpSparePartCode)); - query.BatchDelete(); - return true; - } - public virtual bool DelVersion(string version,string model) - { - var query = GetQueryable().Where(p => p.Version == version && p.Model==model); - query.BatchDelete(); - return true; - } - - public virtual bool Insert(List list) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - - DbContext.BulkInsert(list); - } - catch (Exception e) - { - throw e; - } - return true; - } - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs deleted file mode 100644 index ba18900d..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs +++ /dev/null @@ -1,66 +0,0 @@ -using EFCore.BulkExtensions; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef; - -namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.SettlementPakAndSparePartsRef -{ - public class SettlementPakAndSparePartVersionRepository : EfCoreRepository, ITransientDependency - { - public SettlementPakAndSparePartVersionRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - - } - - //public virtual bool DelVersion(string version, List settleCodeList) - //{ - // var query = GetQueryable().Where(p => p.Version == version); - // query.BatchDelete(); - // return true; - //} - - - public virtual bool Delete(string version) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - var _detailQuery = GetQueryable().Where(p => p.Version == version); - _detailQuery.BatchDelete(); - } - catch (Exception e) - { - throw e; - } - return true; - } - - public virtual bool Insert(string p_version, string p_customCode, string p_factory) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - var _first = GetQueryable().FirstOrDefault(p => p.Version == p_version && p.CustomerCode == p_customCode); - if (_first == null) - { - var version = new SettlementPakAndSparePartsVersion(GuidGenerator.Create(), GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory); - List _ls = new List(); - _ls.Add(version); - DbContext.BulkInsert(_ls); - } - } - catch (Exception e) - { - throw e; - } - return true; - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs deleted file mode 100644 index 2185dfd7..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs +++ /dev/null @@ -1,69 +0,0 @@ -using EFCore.BulkExtensions; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Entities; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.Uow; -using Win.Sfs.SettleAccount.Entities; -using Win.Sfs.SettleAccount.Entities.SettleAccounts; - -namespace Win.Sfs.SettleAccount.Repository.SettleAccount -{ - - - public class UnSettleAccountRepository : EfCoreRepository, ITransientDependency - { - public UnSettleAccountRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - - } - public virtual bool Delete(string version) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - var _detailQuery = DbSet.Where(p => p.Version == version); - _detailQuery.BatchDelete(); - } - catch (Exception e) - { - throw e; - } - return true; - } - - public virtual bool Insert(List list) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - List _insertls = new List(); - if (list.Count > 0) - { - var _version = list.FirstOrDefault().Version; - var _ls= GetQueryable().Where(p => p.Version == _version).Select(p=>new { MaterialCode=p.MaterialCode, ChassisNumber=p.ChassisNumber }).ToList(); - var _query = from r1 in list join r2 in _ls on new { r1.ChassisNumber, r1.MaterialCode } equals new { r2.ChassisNumber, r2.MaterialCode } - into temp from t in temp.DefaultIfEmpty() - where t==null - select r1 ; - foreach (var s in _query.ToList()) - { - _insertls.Add(s); - } - } - DbContext.BulkInsert(_insertls,new BulkConfig() { BatchSize=100000, BulkCopyTimeout=0 }); - } - catch (Exception e) - { - throw e; - } - return true; - } - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs deleted file mode 100644 index 4da812ae..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs +++ /dev/null @@ -1,81 +0,0 @@ -using EFCore.BulkExtensions; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Entities; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.Uow; -using Win.Sfs.SettleAccount.Entities; -using Win.Sfs.SettleAccount.Entities.SettleAccounts; - -namespace Win.Sfs.SettleAccount.Repository.SettleAccount -{ - - - public class UnSettleAccountVersionRepository : EfCoreRepository, ITransientDependency - { - public UnSettleAccountVersionRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - - } - public virtual bool Delete(string version) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - var _detailQuery = DbSet.Where(p => p.Version == version); - _detailQuery.BatchDelete(); - } - catch (Exception e) - { - throw e; - } - return true; - } - public virtual bool Insert(Guid guid, string p_version, string p_customCode, string p_factory) - { - try - { - DbContext.Database.SetCommandTimeout(1200); - var _first = GetQueryable().FirstOrDefault(p => p.Version == p_version); - if (_first == null) - { - var version = new UnSettleAccountVersion(guid, GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory); - List _ls = new List(); - _ls.Add(version); - DbContext.BulkInsert(_ls); - } - } - catch (Exception e) - { - throw e; - } - return true; - } - //public virtual bool Insert(string p_version,string p_customCode,string p_factory) - //{ - // try - // { - // DbContext.Database.SetCommandTimeout(1200); - // var _first= GetQueryable().FirstOrDefault(p => p.Version == p_version); - // if (_first == null) - // { - // var version = new UnSettleAccountVersion(GuidGenerator.Create(), GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory); - // List _ls = new List(); - // _ls.Add(version); - // DbContext.BulkInsert(_ls) ; - // } - // } - // catch (Exception e) - // { - // throw e; - // } - // return true; - //} - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs deleted file mode 100644 index bbec2721..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; -using System.Data.SqlClient; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Storage; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Entities; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Win.Sfs.Shared; -using Win.Sfs.Shared.DomainBase; -using Win.Sfs.Shared.Filter; -using Win.Sfs.Shared.RepositoryBase; - -namespace Win.Sfs.SettleAccount.Repository -{ - public class WMSEfCoreRepository : - EfCoreRepository, - ITransientDependency - where TEntity : class,IEntity - { - - private readonly IDbContextProvider _dbContextProvider; - - - - public WMSEfCoreRepository(IDbContextProvider dbContextProvider) : - base(dbContextProvider) - { - - _dbContextProvider = dbContextProvider; - - } - public WMSEfCoreRepository() : base(null) - { - - } - - public DbCommand CreateCommand(string commandText, CommandType commandType, params DbParameter[] parameters) - { - var command = DbContext.Database.GetDbConnection().CreateCommand(); - - command.CommandText = commandText; - command.CommandType = commandType; - command.Transaction = DbContext.Database.CurrentTransaction?.GetDbTransaction(); - - foreach (var parameter in parameters) - { - command.Parameters.Add(parameter); - } - - return command; - } - - public async Task EnsureConnectionOpenAsync(CancellationToken cancellationToken = default) - { - var connection = DbContext.Database.GetDbConnection(); - - if (connection.State != ConnectionState.Open) - { - await connection.OpenAsync(cancellationToken); - } - } - public virtual async Task> GetAllAsync( bool includeDetails = false, - CancellationToken cancellationToken = default) - { - var query = includeDetails ? this.WithDetails() : this.GetQueryable(); - - //query = query.Where(p => p.BranchId.Equals(branchId)); - - return await query.ToListAsync(cancellationToken: cancellationToken); - } - - public virtual async Task GetCountAsync( CancellationToken cancellationToken = default) - { - return await this.GetQueryable() - //.Where(p => p.BranchId.Equals(branchId)) - .LongCountAsync(GetCancellationToken(cancellationToken)); - - } - - public virtual async Task GetCountByFilterAsync( List filters, - CancellationToken cancellationToken = default) - { - return await this.GetQueryable() - //.Where(p => p.BranchId.Equals(branchId)) - .WhereIf(filters?.Count != 0, filters.ToLambda()) - .LongCountAsync(GetCancellationToken(cancellationToken)); - } - - public virtual async Task> GetListByFilterAsync(List filters, - string sorting = null, - int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, - CancellationToken cancellationToken = default) - { - var query = includeDetails ? this.WithDetails() : this.GetQueryable(); - // query = query.Where(p => p.BranchId.Equals(branchId)); - var entities = query.WhereIf(filters?.Count != 0, filters.ToLambda()); - //2021-07-02 设置sorting首字母大小，因设置了驼峰规则，不匹配“ var memberProp = typeof(T).GetProperty(propertyName);”反射 - if(!string.IsNullOrEmpty(sorting)) - { - sorting = sorting.Substring(0, 1).ToUpper() + sorting.Substring(1); - } - entities = GetSortingQueryable(entities, sorting); - return await entities.PageBy(skipCount, maxResultCount) - .ToListAsync(GetCancellationToken(cancellationToken)); - - - } - - protected static IQueryable GetSortingQueryable(IQueryable entities, string sorting) - { - if (string.IsNullOrEmpty(sorting)) - { - entities = entities.OrderByDescending("Id"); - } - else - { - - - - - var sortParams = sorting?.Split(' '); - var sortName = sortParams[0]; - - - Type t = typeof(TEntity); - var _first = t.GetProperties().Where(p => p.Name.ToUpper() == sortName.ToUpper()).FirstOrDefault(); - if (_first != null) - { - sortName = _first.Name; - } - - - - - bool isDesc; - if (sortParams.Length > 1) - { - var sortDirection = sortParams[1]; - isDesc = sortDirection.ToUpper().Contains("DESC") ? true : false; - } - else - { - isDesc = true; - } - - entities = isDesc ? entities.OrderByDescending(sortName) : entities.OrderBy(sortName); - } - - return entities; - } - - } - - -} \ No newline at end of file diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs b/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs index 4548ffba..33990d59 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs @@ -11,7 +11,6 @@ using System.Text; using System.Threading.Tasks; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Entities; -using Win.Sfs.SettleAccount.Entities.WMS; namespace Win.Sfs.SettleAccount { @@ -39,29 +38,6 @@ namespace Win.Sfs.SettleAccount return File(fileDto.Content, "application/octet-stream", fileDto.Name); } - /// - /// 客户自定义发货结算导入模板 - /// - /// - [HttpPost] - [Route("saveCustomExcelTemplate")] - public async Task SaveCustomExcelImportTemplate() - { - string fileName = "客户自定义发货结算导入模板.xlsx"; - var result = await Importer.GenerateTemplateBytes(); - result.ShouldNotBeNull(); - result.Length.ShouldBeGreaterThan(0); - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = fileName, - Content = result - } - ); - return fileName; - } - - /// /// 红旗一轿手工出库单导入模板 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs index ef541af0..a466b07a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs @@ -21,7 +21,6 @@ using Volo.Abp.EventBus.Distributed; using Win.Sfs.SettleAccount; using Win.Sfs.SettleAccount.Entities.MaterialRelationships; using Win.Sfs.SettleAccount.Entities.SettleAccounts; -using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef; using Win.Sfs.SettleAccount.Entities.SettlementParts; using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.SettleAccount.MaterialRelationships; @@ -29,13 +28,12 @@ using Win.Sfs.SettleAccount.Repository.Code; using Win.Sfs.SettleAccount.Repository.SettleAccount; using Win.Sfs.SettleAccount.Repository.SettleAccountJob; using Win.Sfs.SettleAccount.Repository.SettleAccountJob.MaterialRelationships; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.SettlementPakAndSparePartsRef; using WY.NewJit.MsgBaseData; using WY.NewJit.MsgTransmission.TianHe; namespace TaskJob.Services { - + public class SecRelationShipImportService : ITransientDependency, IImportJob { @@ -44,9 +42,6 @@ namespace TaskJob.Services private readonly SettlementPartVersionRepository _spartVersionRepository; private readonly MaterialRelationshipDetailRepository _reldetailRepository; private readonly MaterialRelationshipVersionRepository _relversionRepository; - - private readonly SettlementPakAndSparePartRepository _settlePakRepository; - private readonly SettlementPakAndSparePartVersionRepository _settlePakVersionRepository; private readonly IDistributedEventBus _distributedEventBus; private readonly OutputService _outputService; private readonly InputService _inputService; @@ -59,13 +54,9 @@ namespace TaskJob.Services OutputService service, MaterialRelationshipDetailRepository reldetailRepository, MaterialRelationshipVersionRepository relversionRepository, - SettlementPakAndSparePartRepository settlePakRepository, - SettlementPakAndSparePartVersionRepository settlePakVersionRepository, IDistributedEventBus distributedEventBus ) { - _settlePakRepository = settlePakRepository; - _settlePakVersionRepository = settlePakVersionRepository; _codesettingRepository = codesettingRepository; _spartRepository = spartRepository; _spartVersionRepository = spartVersionRepository; @@ -75,16 +66,16 @@ namespace TaskJob.Services _outputService = service; _inputService = inputService; _codesettingRepository = codesettingRepository; - + } public string ImportFile(Guid id, List fileName, List realfileName, List customConditions) { - + var version = customConditions.Where(p => p.Name == "Version").FirstOrDefault().Value; var customerCode = customConditions.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value; var Site = customConditions.Where(p => p.Name == "Site").FirstOrDefault().Value; - + List checkList = new List(); if (string.IsNullOrEmpty(version)) @@ -95,12 +86,12 @@ namespace TaskJob.Services { checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, "客户代码不能为空!", string.Empty)); } - if (Site=="TH") + if (Site == "TH") { bool isInvoke = true; foreach (var itm in fileName) { - if (!Regex.IsMatch(itm, @"^\w+\s\w+\s") ) + if (!Regex.IsMatch(itm, @"^\w+\s\w+\s")) { var error = string.Format("文件名称{0}不符合导入规则,规则例如:AUDI B9 XXXXX.xlsx间隔一位空格!", itm); checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty)); @@ -109,66 +100,22 @@ namespace TaskJob.Services } if (isInvoke == true) { - foreach (var itm in fileName) - { - string _fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\"; - var _filePath = _fileSavePath + itm;//获取到导入的excel - var _exten = Path.GetExtension(_fileSavePath); - - var file = Path.GetFileName(_filePath); - var model = Regex.Match(file, @"^\w+\s\w+\s").Value.Trim(); - _settlePakRepository.Delete(version,model); - - - var _ds = Import(_filePath, 4); - var _errorlist = ImportRelationship(_ds, version, customerCode, model); - - if (_errorlist.Count == 0) - { - var _errlist = ImportPriceList(_ds, version, customerCode, model); - - - foreach (var error in _errlist) - { - checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty)); - } - - if (_errlist.Count == 0) - { - var _errlist1 = ImportSecRelationship(_ds, version, customerCode, model); - - foreach (var error in _errlist1) - { - checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty)); - } - } - - } - else - { - foreach (var error in _errorlist) - { - checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty)); - } - } - - } } } if (checkList.Count > 0) { - _outputService.ExportError(id, string.Format("错误信息_{0}.xlsx",Guid.NewGuid().ToString()), checkList); + _outputService.ExportError(id, string.Format("错误信息_{0}.xlsx", Guid.NewGuid().ToString()), checkList); } return id.ToString(); } - private List ImportPriceList(DataSet ds, string version, string customerCode,string model) + private List ImportPriceList(DataSet ds, string version, string customerCode, string model) { - var projectList=_codesettingRepository.GetList("工厂车型"); + var projectList = _codesettingRepository.GetList("工厂车型"); var factory = string.Empty; - var f=projectList.FirstOrDefault(p => p.Value == model); + var f = projectList.FirstOrDefault(p => p.Value == model); if (f != null) { factory = f.Description; @@ -191,7 +138,7 @@ namespace TaskJob.Services } i++; } - + var _materialCodeKey = table.Columns[12].ColumnName.Trim(); Dictionary _dic = new Dictionary(); @@ -220,7 +167,7 @@ namespace TaskJob.Services if (_dic.Count > 0) { - + //int number2 = 0; foreach (DataRow row in table.Rows) { @@ -228,8 +175,8 @@ namespace TaskJob.Services { if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString())) { - - var part = new SettlementPart(Guid.NewGuid(), Guid.NewGuid(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), customerCode,factory , model, version, settleCode.ToUpper(), string.Empty, _dic[settleCode], string.Empty); + + var part = new SettlementPart(Guid.NewGuid(), Guid.NewGuid(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), customerCode, factory, model, version, settleCode.ToUpper(), string.Empty, _dic[settleCode], string.Empty); partList.Add(part); } } @@ -414,11 +361,11 @@ namespace TaskJob.Services var _templist = from itm1 in _group1 join itm2 in _group2 on new { itm1.ErpMaterialCode } equals new { itm2.ErpMaterialCode } where itm1.Qty != itm2.Qty select itm1; var _delete = from r1 in _ls - join r2 in list on new { r1.SettleMaterialCode, r1.ErpMaterialCode, r1.Version } equals new { r2.SettleMaterialCode, r2.ErpMaterialCode, r2.Version } - into temp - from t in temp.DefaultIfEmpty() - where t == null - select r1; + join r2 in list on new { r1.SettleMaterialCode, r1.ErpMaterialCode, r1.Version } equals new { r2.SettleMaterialCode, r2.ErpMaterialCode, r2.Version } + into temp + from t in temp.DefaultIfEmpty() + where t == null + select r1; List _ls1 = new List(); foreach (var itm in _templist) @@ -433,26 +380,26 @@ namespace TaskJob.Services _ls1.Add(itm); } - var erplist= _ls1.Distinct().ToList(); + var erplist = _ls1.Distinct().ToList(); - _reldetailRepository.DelDetailByErpPartCode(version,erplist); + _reldetailRepository.DelDetailByErpPartCode(version, erplist); - var _add=_ls.Where(p => erplist.Contains(p.ErpMaterialCode) && p.Version == version); + var _add = _ls.Where(p => erplist.Contains(p.ErpMaterialCode) && p.Version == version); var _addList = _add.ToList(); - foreach(var itm in erplist) + foreach (var itm in erplist) { var parendId = Guid.NewGuid(); - var ary=_addList.Where(p => p.ErpMaterialCode == itm); + var ary = _addList.Where(p => p.ErpMaterialCode == itm); foreach (var re in ary) { re.AppraisalCategory = parendId.ToString(); } - + } if (_addList.Count() > 0 && errorList.Count == 0) { @@ -463,153 +410,6 @@ namespace TaskJob.Services return errorList; } - - - - - private List ImportSecRelationship(DataSet ds, string version, string customerCode, string model) - { - List errorList = new List(); - List _ls = new List(); - foreach (DataTable table in ds.Tables) - { - if (table.Columns.Count > 11 && table.Columns[11].ColumnName == "辆份价格") - { - int i = 0; - List settleCodeList = new List(); - foreach (DataColumn column in table.Columns) - { - if (i > 11) - { - settleCodeList.Add(column.ColumnName); - } - i++; - } - if (i == 0) - { - errorList.Add(table.TableName + " [辆份价格]字段不存在!"); - } - - int end = 0; - int number = 0; - - foreach (DataRow row in table.Rows) - { - - if (row["零 件 号"] != null && row["零 件 号"].ToString().Contains("装配费用")) - { - foreach (var settleCode in settleCodeList) - { - if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString())) - { - var _settlementPakAndSpareParts = new SettlementPakAndSpareParts(Guid.NewGuid(), string.Empty, string.Empty, settleCode.Trim().ToUpper(), "装配费用", "装配费", string.Empty, "装配费", "", "J7W", - "采埃孚富奥汽车底盘系统（长春）有限公司", - "装配费", - 1, - !row.IsNull(settleCode)?decimal.Parse(row[settleCode].ToString()):0, - "1", - !row.IsNull(settleCode) ? decimal.Parse(row[settleCode].ToString()) : 0, - version, - customerCode,model); - _ls.Add(_settlementPakAndSpareParts); - } - - } - } - if (row["零 件 号"] != null && row["零 件 号"].ToString().Contains("零件成本")) - { - end = number; - } - number++; - } - if (end == 0) - { - errorList.Add(table.TableName + "零 件 号 列:[零件成本]行不存在!"); - } - int number2 = 0; - foreach (DataRow row in table.Rows) - { - if (number2 < end && number2 > 0 && !row.IsNull("QAD代码") && !string.IsNullOrEmpty(row["QAD代码"].ToString().Trim())) - { - - if (!row.IsNull("零 件 号") && !row.IsNull("每车数量") && row["单价"] != null && !row.IsNull("辆份价格") - && !string.IsNullOrEmpty(row["每车数量"].ToString().Trim()) - && !string.IsNullOrEmpty(row["单价"].ToString().Trim()) - && !string.IsNullOrEmpty(row["辆份价格"].ToString().Trim()) - ) - { - var partcode = row["零 件 号"].ToString(); - var partDesc = row["零件名称"].ToString(); - var partType = row["零件类型"].ToString(); - var QadCode = !row.IsNull("QAD代码") ? row["QAD代码"].ToString() : string.Empty; - var SupplierCode = !row.IsNull("供应商代码") ? row["供应商代码"].ToString() : string.Empty; - var SupplierName = !row.IsNull("供应商名称") ? row["供应商名称"].ToString() : string.Empty; - var ProductType = row["产品类"].ToString(); - var CarNumber = decimal.Parse(row["每车数量"].ToString()); - var Price = decimal.Parse(row["单价"].ToString()); - var CarPrice = decimal.Parse(row["辆份价格"].ToString()); - int key = 0; - foreach (var settleCode in settleCodeList) - { - if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString())) - { - var _settlementPakAndSpareParts = new SettlementPakAndSpareParts(Guid.NewGuid(), string.Empty, string.Empty, settleCode.Trim().ToUpper(), partDesc, partcode, string.Empty, partType, QadCode, SupplierCode, SupplierName, ProductType, CarNumber, Price, "1", CarPrice, version, customerCode, model); - _ls.Add(_settlementPakAndSpareParts); - } - key++; - } - } - else - { - errorList.Add(table.TableName + ":零 件 号、每车数量、单价、辆份价格不存在!"); - } - } - else - { - if (number2 < end && number2 > 0 && row["零件类型"].ToString() == "自制件") - { - var partcode = row["零 件 号"].ToString(); - var partDesc = row["零件名称"].ToString(); - var partType = row["零件类型"].ToString(); - var QadCode = string.Empty; - var SupplierCode = "J7W"; - var SupplierName = "采埃孚富奥汽车底盘系统（长春）有限公司"; - var ProductType = row["产品类"].ToString(); - var CarNumber = decimal.Parse(row["每车数量"].ToString()); - var Price = decimal.Parse(row["单价"].ToString()); - var CarPrice = decimal.Parse(row["辆份价格"].ToString()); - int key = 0; - - foreach (var settleCode in settleCodeList) - { - if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString())) - { - var _settlementPakAndSpareParts = new SettlementPakAndSpareParts(Guid.NewGuid(), string.Empty, string.Empty, settleCode.Trim().ToUpper(), partDesc, partcode, string.Empty, partType, QadCode, SupplierCode, SupplierName, ProductType, CarNumber, Price, "1", CarPrice, version, customerCode, model); - _ls.Add(_settlementPakAndSpareParts); - } - key++; - } - } - } - number2++; - } - } - } - var query = from arc in _ls - group arc by new { arc.ErpSparePartCode,arc.SettlementPartCode } - into g - where g.Count() > 1 - select g; - var _addList= _ls.GroupBy(p => new { p.ErpSparePartCode, p.SettlementPartCode }).Select(y => y.FirstOrDefault()); - var _lst= _ls.GroupBy(p => new { p.ErpSparePartCode, p.SettlementPartCode }).Select(y => new { ErpSparePartCode = y.Key.ErpSparePartCode, SettlementPartCode = y.Key.SettlementPartCode, Count = y.Count() }).Where(p=>p.Count>1); - foreach (var itm in _lst) - { - var _first = _addList.FirstOrDefault(p => p.ErpSparePartCode == itm.ErpSparePartCode && p.SettlementPartCode == itm.SettlementPartCode); - var _carNumber =_ls.Where(p => p.ErpSparePartCode == itm.ErpSparePartCode && p.SettlementPartCode == itm.SettlementPartCode).GroupBy(p => new { p.ErpSparePartCode, p.SettlementPartCode }).Select(p => new { ErpSparePartCode = p.Key.ErpSparePartCode, SettlementPartCode = p.Key.SettlementPartCode, PerCarNum = p.Sum(y => y.PerCarNum) }); - - _first.PerCarNum = _carNumber.FirstOrDefault().PerCarNum; - } - //var list = _settlePakRepository.GetDetail(version, customerCode); //var _group1 = _ls.Where(p => p.Version == version).GroupBy(p => p.ErpSparePartCode).Select(p => new { Price = p.Sum(p => p.Price), Qty = p.Sum(p => p.PerCarNum), ErpSparePartCode = p.Key }); //var _group2 = list.Where(p => p.Version == version).GroupBy(p => p.ErpSparePartCode).Select(p => new { Price = p.Sum(p => p.Price), Qty = p.Sum(p => p.PerCarNum), ErpSparePartCode = p.Key }); @@ -635,123 +435,130 @@ namespace TaskJob.Services //var _add = _ls.Where(p => erplist.Contains(p.ErpSparePartCode) && p.Version == version); //var _addList = _add.ToList(); - if (_addList.Count() > 0 && errorList.Count == 0) - { - var ary = _addList.ToList(); - _settlePakRepository.Insert(ary); - _settlePakVersionRepository.Insert(version, customerCode, customerCode); - } - - return errorList; - } - /// 读取excel /// 默认第一行为表头 /// /// excel文档绝对路径 /// 内容行偏移量，第一行为表头，内容行从第二行开始则为1 /// - public DataSet Import(string strFileName, int rowIndex) - { - //DataTable dt = new DataTable(); - DataSet _ds = new DataSet(); - List _sheetNames = new List(); - IWorkbook hssfworkbook; - using (FileStream file = new FileStream(strFileName, FileMode.Open, FileAccess.Read)) + public DataSet Import(string strFileName, int rowIndex) { - hssfworkbook = WorkbookFactory.Create(file); - } - int x = hssfworkbook.NumberOfSheets; ; - List sheetNames = new List(); - for (int i = 0; i < x; i++) - { - _sheetNames.Add(hssfworkbook.GetSheetName(i)); + //DataTable dt = new DataTable(); + DataSet _ds = new DataSet(); + List _sheetNames = new List(); + IWorkbook hssfworkbook; + using (FileStream file = new FileStream(strFileName, FileMode.Open, FileAccess.Read)) + { + hssfworkbook = WorkbookFactory.Create(file); + } + int x = hssfworkbook.NumberOfSheets; ; + List sheetNames = new List(); + for (int i = 0; i < x; i++) + { + _sheetNames.Add(hssfworkbook.GetSheetName(i)); + } + foreach (var itm in _sheetNames) + { + ISheet sheet = hssfworkbook.GetSheet(itm); + IRow headRow = sheet.GetRow(rowIndex); + + if (headRow != null) + { + bool isAnlysis = false; + int colCount = headRow.LastCellNum; + if (colCount > 11) + { + if (headRow.Cells[11] != null && headRow.Cells[11].StringCellValue.Trim() == "辆份价格") + { + isAnlysis = true; + } + } + if (isAnlysis == true) + { + _ds.Tables.Add(GetDataTable(hssfworkbook, sheet, 4)); + } + } + + } + return _ds; + } - foreach (var itm in _sheetNames) + public DataTable GetDataTable(IWorkbook hssfworkbook, ISheet sheet, int rowIndex) { - ISheet sheet = hssfworkbook.GetSheet(itm); + var dt = new DataTable(); + dt.TableName = sheet.SheetName; IRow headRow = sheet.GetRow(rowIndex); - if (headRow != null) { - bool isAnlysis = false; int colCount = headRow.LastCellNum; if (colCount > 11) { - if (headRow.Cells[11] != null && headRow.Cells[11].StringCellValue.Trim() == "辆份价格") + for (int i = 0; i < colCount; i++) { - isAnlysis = true; + dt.Columns.Add(headRow.Cells[i].StringCellValue.Trim()); } } - if (isAnlysis == true) - { - _ds.Tables.Add(GetDataTable(hssfworkbook, sheet, 4)); - } - } - - } - return _ds; - - } - public DataTable GetDataTable(IWorkbook hssfworkbook, ISheet sheet,int rowIndex) - { - var dt = new DataTable(); - dt.TableName =sheet.SheetName; - IRow headRow = sheet.GetRow(rowIndex); - if (headRow != null) - { - int colCount = headRow.LastCellNum; - if (colCount>11) - { - for (int i = 0; i < colCount; i++) + else { - dt.Columns.Add(headRow.Cells[i].StringCellValue.Trim()); + for (int i = 0; i < colCount; i++) + { + dt.Columns.Add("Grid_" + i.ToString()); + } } } - else - { - for (int i = 0; i < colCount; i++) - { - dt.Columns.Add("Grid_"+i.ToString()); - } - } - } - for (int i = (sheet.FirstRowNum + rowIndex); i <= sheet.LastRowNum; i++) - { - IRow row = sheet.GetRow(i); - bool emptyRow = true; - object[] itemArray = null; - if (row != null && row.LastCellNum>=0) + for (int i = (sheet.FirstRowNum + rowIndex); i <= sheet.LastRowNum; i++) { - itemArray = new object[row.LastCellNum]; - try + IRow row = sheet.GetRow(i); + bool emptyRow = true; + object[] itemArray = null; + if (row != null && row.LastCellNum >= 0) { - for (int j = row.FirstCellNum; j < row.LastCellNum; j++) + itemArray = new object[row.LastCellNum]; + try { - if (row.GetCell(j) != null) + for (int j = row.FirstCellNum; j < row.LastCellNum; j++) { - switch (row.GetCell(j).CellType) + if (row.GetCell(j) != null) { - case CellType.Numeric: - if (HSSFDateUtil.IsCellDateFormatted(row.GetCell(j)))//日期类型 - { - itemArray[j] = row.GetCell(j).DateCellValue.ToString("yyyy-MM-dd"); - } - else//其他数字类型 - { - itemArray[j] = row.GetCell(j).NumericCellValue; - } - break; - case CellType.Blank: - itemArray[j] = string.Empty; - break; - case CellType.Formula: //获取公式执行后的值,速度较慢 - if (hssfworkbook is XSSFWorkbook) - { - try + switch (row.GetCell(j).CellType) + { + case CellType.Numeric: + if (HSSFDateUtil.IsCellDateFormatted(row.GetCell(j)))//日期类型 + { + itemArray[j] = row.GetCell(j).DateCellValue.ToString("yyyy-MM-dd"); + } + else//其他数字类型 { - XSSFFormulaEvaluator eva = new XSSFFormulaEvaluator(hssfworkbook); + itemArray[j] = row.GetCell(j).NumericCellValue; + } + break; + case CellType.Blank: + itemArray[j] = string.Empty; + break; + case CellType.Formula: //获取公式执行后的值,速度较慢 + if (hssfworkbook is XSSFWorkbook) + { + try + { + XSSFFormulaEvaluator eva = new XSSFFormulaEvaluator(hssfworkbook); + if (eva.Evaluate(row.GetCell(j)).CellType == CellType.Numeric) + { + itemArray[j] = eva.Evaluate(row.GetCell(j)).NumberValue; + } + else + { + itemArray[j] = eva.Evaluate(row.GetCell(j)).StringValue; + } + } + catch (Exception e) + { + var b = j; + } + } + else + { + HSSFFormulaEvaluator eva = new HSSFFormulaEvaluator(hssfworkbook); if (eva.Evaluate(row.GetCell(j)).CellType == CellType.Numeric) { itemArray[j] = eva.Evaluate(row.GetCell(j)).NumberValue; @@ -761,60 +568,43 @@ namespace TaskJob.Services itemArray[j] = eva.Evaluate(row.GetCell(j)).StringValue; } } - catch(Exception e) - { - var b = j; - } - } - else - { - HSSFFormulaEvaluator eva = new HSSFFormulaEvaluator(hssfworkbook); - if (eva.Evaluate(row.GetCell(j)).CellType == CellType.Numeric) - { - itemArray[j] = eva.Evaluate(row.GetCell(j)).NumberValue; - } - else - { - itemArray[j] = eva.Evaluate(row.GetCell(j)).StringValue; - } - } - break; - default: - itemArray[j] = row.GetCell(j).StringCellValue; - break; - } - if (itemArray[j] != null && !string.IsNullOrEmpty(itemArray[j].ToString().Trim())) - { - emptyRow = false; + break; + default: + itemArray[j] = row.GetCell(j).StringCellValue; + break; + } + if (itemArray[j] != null && !string.IsNullOrEmpty(itemArray[j].ToString().Trim())) + { + emptyRow = false; + } } } } + catch (Exception e) + { + var a = i; + + + } } - catch(Exception e) - { - var a = i; - - - } - } - if (!emptyRow) - { - if (itemArray.Count()> dt.Columns.Count) + if (!emptyRow) { - var _ls = itemArray.ToList(); - _ls.RemoveRange(dt.Columns.Count, itemArray.Count() - dt.Columns.Count); - itemArray = _ls.ToArray(); - } + if (itemArray.Count() > dt.Columns.Count) + { + var _ls = itemArray.ToList(); + _ls.RemoveRange(dt.Columns.Count, itemArray.Count() - dt.Columns.Count); + itemArray = _ls.ToArray(); + } - dt.Rows.Add(itemArray); + dt.Rows.Add(itemArray); + } } + return dt; } - return dt; + + } } - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs index f17ecb86..df47b411 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs @@ -23,7 +23,7 @@ namespace SettleAccount.Job.Services.Report private readonly OutputService _outputService; private readonly InputService _inputService; - private readonly WmsDapperRepository _wmsDapper; + private readonly IBlobContainer _fileContainer; @@ -32,7 +32,6 @@ namespace SettleAccount.Job.Services.Report ErpPartDapperRepository erpdapperRepository, HQHSettledDetailDapperRepository dapperRepository, OutputService outputService, - WmsDapperRepository wmsDapper, InputService inputService , IBlobContainer fileContainer @@ -41,7 +40,6 @@ namespace SettleAccount.Job.Services.Report _inputService = inputService; _outputService = outputService; _erpdapperRepository = erpdapperRepository; - _wmsDapper = wmsDapper; _fileContainer = fileContainer; _dapperRepository = dapperRepository; } @@ -66,26 +64,6 @@ namespace SettleAccount.Job.Services.Report var _ls_sum = _dapperRepository.GetSharePartSumSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); //按照零件号汇总数量，有一列显示寄售库数量 - var stockList = _wmsDapper.GetSalesStock("BJJS"); - var queryStockList = from itm in _ls_sum - join itm1 in stockList on itm.Sap编码 equals itm1.SapCode into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new HQHSharePartSettledDetailDiffSum( - itm.Sap编码, - itm.结算物料号, - itm.物料描述, - itm.结算单价, - itm.收货仓库, - itm.收货仓库描述, - itm.发货定价, - itm.价格差异, - itm.差异总金额, - itm.结算金额, - itm.结算数量, - tm1 == null ? 0 : tm1.Qty, - itm.物料组 - ); - //var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); //var _lst=_dapperRepository.GetDiffQtyList(version); @@ -157,7 +135,6 @@ namespace SettleAccount.Job.Services.Report ExcelExporter _exporter = new ExcelExporter();//导出Excel var result = _exporter.Append(_ls.ToList(), "红旗工厂备件明细") .SeparateBySheet() - .Append(queryStockList.ToList(), "备件汇总比对寄售库存") .ExportAppendDataAsByteArray(); result.ShouldNotBeNull(); _fileContainer.SaveAsync(_filename, result.Result, true); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs index 2c2bf34b..c64085bd 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using TaskJob.EventArgs; using TaskJob.Interfaces; using Volo.Abp.DependencyInjection; -using Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs; using Win.Sfs.SettleAccount.Repository.Report; using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs index ab19ae5c..96368048 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs @@ -22,26 +22,9 @@ namespace SettleAccount.Job.Services.Report private readonly OutputService _outputService; private readonly ErpPartDapperRepository _erpdapperRepository; private readonly IBlobContainer _fileContainer; - private readonly WmsDapperRepository _wmsDapper; - - private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; - - - public SettleSparePartExportService(SettleSparePartDapperReportRepository dapper, - ISettleAccountBranchEfCoreRepository errorListRepository, - ErpPartDapperRepository erpdapperRepository, OutputService outputService - , WmsDapperRepository wmsDapper - , IBlobContainer fileContainer) - { - _dapper = dapper; - _outputService = outputService; - _erpdapperRepository = erpdapperRepository; - _fileContainer = fileContainer; - _wmsDapper = wmsDapper; - _errorListRepository = errorListRepository; - } + private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; public string ExportFile(Guid id, List exportName, List p_list) { var fileName = exportName.FirstOrDefault(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs index f2ef5bb9..1dbeabdf 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs @@ -22,21 +22,21 @@ namespace SettleAccount.Job.Services.Report private readonly OutputService _outputService; private readonly ErpPartDapperRepository _erpdapperRepository; private readonly IBlobContainer _fileContainer; - private readonly WmsDapperRepository _wmsDapper; + private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; public SettleUnSparePartExportService(SettleSparePartDapperReportRepository dapper, ISettleAccountBranchEfCoreRepository errorListRepository, ErpPartDapperRepository erpdapperRepository, OutputService outputService - , WmsDapperRepository wmsDapper + , IBlobContainer fileContainer) { _dapper = dapper; _outputService = outputService; _erpdapperRepository = erpdapperRepository; _fileContainer = fileContainer; - _wmsDapper = wmsDapper; + _errorListRepository = errorListRepository; } @@ -56,54 +56,13 @@ namespace SettleAccount.Job.Services.Report //反向对比，即大众备件未结（有单号），包含有发货有结算并且发货数量大于结算数量的数据也整合到未结中 var _reversels_withcode = _dapper.GetReverseWithCodeSettleSparePartReportList_unsettle(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime); - - var stockList = _wmsDapper.GetSalesStock("BJJS"); - //针对无单号备件，求和汇总显示 var _forwardls_nocode = _dapper.GetNoCodeSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime); - var queryStockList_nocode = from itm in _forwardls_nocode - join itm1 in stockList on itm.SAP编码 equals itm1.SapCode into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new SettleSparePartExport( - itm.SAP编码, - itm.物料代码, - itm.物料描述, - itm.发货数量, - itm.收货数量, - itm.开票数量, - itm.收货与开票差异, - itm.开票单价, - itm.开票金额, - itm.定价, - itm.单价差异, - itm.差异总金额, - tm1 == null ? 0 : tm1.Qty - ); //不管有单号备件还是无单号备件，财务要求全部按照零件汇总求和显示，并和寄售库存比对 var _forwardls = _dapper.GetForwardSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime); //按照零件号汇总数量，有一列显示寄售库数量 - var queryStockList = from itm in _forwardls - join itm1 in stockList on itm.SAP编码 equals itm1.SapCode into temp1 - from tm1 in temp1.DefaultIfEmpty() - select new SettleSparePartExport( - itm.SAP编码, - itm.物料代码, - itm.物料描述, - itm.发货数量, - itm.收货数量, - itm.开票数量, - itm.收货与开票差异, - itm.开票单价, - itm.开票金额, - itm.定价, - itm.单价差异, - itm.差异总金额, - tm1 == null ? 0 : tm1.Qty - ); - - if (!string.IsNullOrEmpty(sapCode)) { var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs index b3321115..1b8618a5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs @@ -10,7 +10,6 @@ using TaskJob.Interfaces; using Volo.Abp.BlobStoring; using Volo.Abp.DependencyInjection; using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs; using Win.Sfs.SettleAccount.Repository.Report; namespace SettleAccount.Job.Services.Report @@ -39,15 +38,11 @@ namespace SettleAccount.Job.Services.Report //var state = p_list.Where(p => p.Name == "State").FirstOrDefault().Value; var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; var customerCode = p_list.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value; - var _list= _dapper.GetDiffReport(DateTime.Now.Year.ToString(), customerCode, version); - var _childList= _dapper.GetDiffDetailReport(DateTime.Now.Year.ToString(), customerCode, version); var _filename = exportName.FirstOrDefault(); ExcelExporter _exporter = new ExcelExporter();//导出Excel var result = _exporter - .Append(_list, "BOM价格对比明细") .SeparateBySheet() - .Append(_childList, "无价格零件") .SeparateBySheet() .ExportAppendDataAsByteArray(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs index ac9c17d7..1450bfc3 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs @@ -25,7 +25,7 @@ namespace SettleAccount.Job.Services.Report private readonly HQHSettledDetailDapperRepository _hqkanbanDapper; private readonly KanbanUnSettledDapperRepository _kanbanDapper; private readonly UnSettledDetailDapperRepository _dapper; - private readonly WmsDapperRepository _wmsDapper; + private readonly OutputService _outputService; private readonly ErpPartDapperRepository _erpDapper; private readonly SettleSparePartDapperReportRepository _sparepartdapper; @@ -37,13 +37,11 @@ namespace SettleAccount.Job.Services.Report UnSettledDetailDapperRepository dapper, OutputService outputService, ErpPartDapperRepository erpDapper, - WmsDapperRepository wmsDapper, SettleSparePartDapperReportRepository sparepartdapper, ErpPartDapperRepository erpdapperRepository, IBlobContainer fileContainer ) { - _wmsDapper = wmsDapper; _hqkanbanDapper = hqkanbanDapper; _kanbanDapper = kanbanDapper; _dapper = dapper; @@ -56,26 +54,6 @@ namespace SettleAccount.Job.Services.Report [UnitOfWork(false)] public string ExportFile(Guid id, List exportName, List p_list) { - - var _lsExport= GetReport(id,exportName,p_list); - var _lsleft = GetLeftReport(id, exportName, p_list); - - - - - //ExcelExporter _exporter = new ExcelExporter();//导出Excel - //var result = _exporter.Append(_lsExport, "汇总核对表1") - ////.SeparateBySheet() - ////.Append(_lsleft, "汇总核对表2") - //.ExportAppendDataAsByteArray(); - - //result.ShouldNotBeNull(); - //_fileContainer.SaveAsync(String.Format("结算未结寄售核对表{0}.xlsx",Guid.NewGuid().ToString("N")), result.Result, true); - - - - var _first = exportName.FirstOrDefault(); - _outputService.Export(id, _first, _lsExport); return id.ToString(); @@ -401,93 +379,6 @@ namespace SettleAccount.Job.Services.Report return kanbanList; } - - - - - - public List GetReport(Guid id, List exportName, List p_list) - { - var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; - List _ls = new List(); - _ls.AddRange(GetFisSum(id, exportName, p_list)); - _ls.AddRange(GetHQKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结 - - - - var _lst = _wmsDapper.GetSalesStockSum(version); - var query = from itm in _lst - join itm1 in _ls - on new { Version = itm.Version, PartCode = itm.PartCode.Trim(), LocCode= itm.LocCode.ToUpper()} equals new { Version = itm1.版本, PartCode = itm1.物料号.Trim(), LocCode = itm1.库位} -into temp - from tm in temp.DefaultIfEmpty() - select new UnSettledSum - { - - 版本 = itm.Version, - 物料号 = itm.PartCode, - 物料描述 = itm.PartDesc, - 物料组编码= itm.PartGroup, - 物料组车型 = itm.PartGroupDesc, - SAS未结明细汇总 = tm == null ? "0" : tm.SAS未结明细汇总, - WMS期初库存 = itm.StartQty.ToString(), - WMS期末库存 = itm.EndQty.ToString(), - 库位 = itm.LocCode, - 本月减少 = itm.OutQty.ToString(), - 本月增加 = itm.InQty.ToString(), - 差异= (itm.EndQty- decimal.Parse( tm == null ? "0" : tm.SAS未结明细汇总)).ToString() - - - }; - return query.ToList(); - } - - - public List GetLeftReport(Guid id, List exportName, List p_list) - { - var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; - List _ls = new List(); - _ls.AddRange(GetFisSum(id, exportName, p_list)); - _ls.AddRange(GetHQKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结 - - - - var _lst = _wmsDapper.GetSalesStockSum(version); - var query = from itm in _ls - join itm1 in _lst - on new { Version = itm.版本, PartCode = itm.物料号.Trim(), LocCode = itm.库位 } equals - new { Version = itm1.Version, PartCode = itm1.PartCode.Trim(), LocCode = itm1.LocCode.ToUpper() } -into temp - from tm in temp.DefaultIfEmpty() - select new UnSettledSum - { - - 版本 = itm.版本, - 物料号 = itm.物料号, - 物料描述 = itm.物料号, - 物料组编码 = itm.物料组编码, - 物料组车型 = itm.物料组车型, - SAS未结明细汇总 = tm == null ? "0" : tm.EndQty.ToString(), - WMS期初库存 = tm == null ? "0" : tm.StartQty.ToString(), - WMS期末库存 = tm == null ? "0" : tm.EndQty.ToString(), - 库位 = itm.库位, - 本月减少 = tm == null ? "0" : tm.OutQty.ToString(), - 本月增加 = tm == null ? "0" : tm.InQty.ToString(), - 差异 = ((tm == null ? 0 : tm.EndQty) - decimal.Parse(tm == null ? "0" : itm.SAS未结明细汇总)).ToString() - - - }; - return query.ToList(); } - - - - - - } -} + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs index 47c1d8dd..b2ae4c81 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs @@ -49,12 +49,11 @@ namespace SettleAccount.Job.Services.Report public string 差异 { set; get; } } - public class UnSettledSumService : ITransientDependency, IExportJob + public class UnSettledSumService : ITransientDependency { private readonly HQHSettledDetailDapperRepository _hqkanbanDapper; private readonly KanbanUnSettledDapperRepository _kanbanDapper; private readonly UnSettledDetailDapperRepository _dapper; - private readonly WmsDapperRepository _wmsDapper; private readonly OutputService _outputService; private readonly ErpPartDapperRepository _erpDapper; private readonly SettleSparePartDapperReportRepository _sparepartdapper; @@ -66,13 +65,11 @@ namespace SettleAccount.Job.Services.Report UnSettledDetailDapperRepository dapper, OutputService outputService, ErpPartDapperRepository erpDapper, - WmsDapperRepository wmsDapper, SettleSparePartDapperReportRepository sparepartdapper, IBlobContainer fileContainer ) { - _wmsDapper = wmsDapper; _hqkanbanDapper = hqkanbanDapper; _kanbanDapper = kanbanDapper; _dapper = dapper; @@ -82,38 +79,6 @@ namespace SettleAccount.Job.Services.Report _fileContainer = fileContainer; } - [UnitOfWork(false)] - public string ExportFile(Guid id, List exportName, List p_list) - { - - var _lsExport= GetReport(id,exportName,p_list); - var _lsleft = GetLeftReport(id, exportName, p_list); - - - - - //ExcelExporter _exporter = new ExcelExporter();//导出Excel - //var result = _exporter.Append(_lsExport, "汇总核对表1") - ////.SeparateBySheet() - ////.Append(_lsleft, "汇总核对表2") - //.ExportAppendDataAsByteArray(); - - //result.ShouldNotBeNull(); - //_fileContainer.SaveAsync(String.Format("结算未结寄售核对表{0}.xlsx",Guid.NewGuid().ToString("N")), result.Result, true); - - - - var _first = exportName.FirstOrDefault(); - _outputService.Export(id, _first, _lsExport); - return id.ToString(); - - - } - - - - - [UnitOfWork(false)] public List GetFisSum(Guid id, List exportName, List p_list) { @@ -444,88 +409,6 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms - public List GetReport(Guid id, List exportName, List p_list) - { - var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; - List _ls = new List(); - _ls.AddRange(GetFisSum(id, exportName, p_list)); - _ls.AddRange(GetHQKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结 - - - - var _lst = _wmsDapper.GetSalesStockSum(version); - var query = from itm in _lst - join itm1 in _ls - on new { Version = itm.Version, PartCode = itm.PartCode.Trim(), LocCode= itm.LocCode.ToUpper()} equals new { Version = itm1.版本, PartCode = itm1.物料号.Trim(), LocCode = itm1.库位} -into temp - from tm in temp.DefaultIfEmpty() - select new UnSettledSum - { - - 版本 = itm.Version, - 物料号 = itm.PartCode, - 物料描述 = itm.PartDesc, - 物料组编码= itm.PartGroup, - 物料组车型 = itm.PartGroupDesc, - SAS未结明细汇总 = tm == null ? "0" : tm.SAS未结明细汇总, - WMS期初库存 = itm.StartQty.ToString(), - WMS期末库存 = itm.EndQty.ToString(), - 库位 = itm.LocCode, - 本月减少 = itm.OutQty.ToString(), - 本月增加 = itm.InQty.ToString(), - 差异= (itm.EndQty- decimal.Parse( tm == null ? "0" : tm.SAS未结明细汇总)).ToString() - - - }; - return query.ToList(); - } - - - public List GetLeftReport(Guid id, List exportName, List p_list) - { - var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; - List _ls = new List(); - _ls.AddRange(GetFisSum(id, exportName, p_list)); - _ls.AddRange(GetHQKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetKanbanSum(id, exportName, p_list)); - _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结 - - - - var _lst = _wmsDapper.GetSalesStockSum(version); - var query = from itm in _ls - join itm1 in _lst - on new { Version = itm.版本, PartCode = itm.物料号.Trim(), LocCode = itm.库位 } equals - new { Version = itm1.Version, PartCode = itm1.PartCode.Trim(), LocCode = itm1.LocCode.ToUpper() } -into temp - from tm in temp.DefaultIfEmpty() - select new UnSettledSum - { - - 版本 = itm.版本, - 物料号 = itm.物料号, - 物料描述 = itm.物料号, - 物料组编码 = itm.物料组编码, - 物料组车型 = itm.物料组车型, - SAS未结明细汇总 = tm == null ? "0" : tm.EndQty.ToString(), - WMS期初库存 = tm == null ? "0" : tm.StartQty.ToString(), - WMS期末库存 = tm == null ? "0" : tm.EndQty.ToString(), - 库位 = itm.库位, - 本月减少 = tm == null ? "0" : tm.OutQty.ToString(), - 本月增加 = tm == null ? "0" : tm.InQty.ToString(), - 差异 = ((tm == null ? 0 : tm.EndQty) - decimal.Parse(tm == null ? "0" : itm.SAS未结明细汇总)).ToString() - - - }; - return query.ToList(); - } - - - - - } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs index fcc1167c..82244810 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs @@ -21,17 +21,13 @@ namespace TaskJob.Services /// public class UnSettleAccountImportService : ITransientDependency, IImportJob { - private readonly UnSettleAccountRepository _repository; - private readonly UnSettleAccountVersionRepository _versionRepository; + private readonly InputService _inputService; public UnSettleAccountImportService( - InputService inputService, - UnSettleAccountRepository repository, - UnSettleAccountVersionRepository versionRepository + InputService inputService ) { - _repository = repository; - _versionRepository = versionRepository; + _inputService = inputService; } @@ -55,7 +51,6 @@ namespace TaskJob.Services var filePath = fileSavePath + itm;//获取到导入的excel var exten = Path.GetExtension(fileSavePath); - List _setls = new List(); List _errorList = new List(); var checkList = new List(); @@ -63,29 +58,8 @@ namespace TaskJob.Services List _precodeList = new List();// var errorlist = new List(); - var dtoList = _inputService.Input(filePath, null, errorlist); - foreach (var dto in dtoList) - { - if (dto.KENNCode.Length == 6) - { - dto.KENNCode = "0" + dto.KENNCode; - } - var _settleaccount = new UnSettleAccount(Guid.NewGuid(), Guid.NewGuid(), dto.SettleYear, dto.KENNCode, - dto.ChassisNumber, dto.Model, dto.CP5A, dto.CP7, - dto.MaterialCode, dto.Qty, string.Empty, string.Empty, - DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(),_id, version, DateTime.Now, Guid.NewGuid(),dto.UnsettledReason); - - _setls.Add(_settleaccount); - } - - var _ls = _setls; - var a = _ls.Where(p => string.IsNullOrEmpty(p.KENNCode)); - var query = from arc in _ls - group arc by new { arc.ChassisNumber, arc.MaterialCode } into g - where g.Count() > 1 - select g; - _repository.Insert(_setls); - _versionRepository.Insert(_id, version, customerCode, customerCode); + + #region diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs index 9a7d7638..4dba8c89 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs @@ -219,11 +219,6 @@ namespace Win.Sfs.SettleAccount { return implementationFactory.GetService(); } - - if (key.Equals(typeof(UnSettledSumService).FullName)) - { - return implementationFactory.GetService(); - } if (key.Equals(typeof(FisOutputService).FullName)) { return implementationFactory.GetService(); diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.dll index c9d08db5..a5c3a589 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.dll and b/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.dll differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb index 05671828..512da4b1 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb and b/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache index 8fe10ea0..ba2c3186 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache and b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache index 507cad31..a5d37786 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache and b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache index 5d6b3243..5fd21b10 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -f07d2ca3dd6442e8b55ef6ad5afa72e0a111088e +45e6072ab5eb696ef5d62c419debca5b1894b3a0 diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt index 3494d13c..a9f4ca0b 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt @@ -58,3 +58,15 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\refint\Win.Abp.Snowflakes.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.pdb D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\ref\Win.Abp.Snowflakes.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Debug\netcoreapp5\Win.Abp.Snowflakes.deps.json +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Debug\netcoreapp5\Win.Abp.Snowflakes.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Debug\netcoreapp5\Win.Abp.Snowflakes.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.csproj.AssemblyReference.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfoInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfo.cs +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\refint\Win.Abp.Snowflakes.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\ref\Win.Abp.Snowflakes.dll diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.dll index c9d08db5..a5c3a589 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.dll and b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.dll differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb index 05671828..512da4b1 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb and b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/ref/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/ref/Win.Abp.Snowflakes.dll index 942af20c..0c32d7d3 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/ref/Win.Abp.Snowflakes.dll and b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/ref/Win.Abp.Snowflakes.dll differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/refint/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/refint/Win.Abp.Snowflakes.dll index 942af20c..0c32d7d3 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/refint/Win.Abp.Snowflakes.dll and b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/refint/Win.Abp.Snowflakes.dll differ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig index 795cd352..57316494 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,8 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = +<<<<<<< HEAD build_property.ProjectDir = D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\ +======= +build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\ +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache index 3522ba02..9342f311 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 490ed7a03a4d14bd9778d0cf635e6ea08e460be1 +======= +dabb1a5d47fc58eca331ebf17c1e39cf211ca0c0 +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt index c4bf4284..9c6564a2 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt @@ -22,6 +22,7 @@ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.dll C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.pdb +<<<<<<< HEAD D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.deps.json D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.pdb @@ -34,3 +35,17 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\refint\Win.Abp.Snowflakes.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.pdb D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll +======= +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.deps.json +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.csproj.AssemblyReference.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfoInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfo.cs +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\refint\Win.Abp.Snowflakes.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json index 0ee6afe0..0c8a60a6 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json @@ -1,23 +1,24 @@ { "format": 1, "restore": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": {} + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": {} }, "projects": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": { + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", + "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", "projectName": "Win.Abp.Snowflakes", - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", - "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\", - "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\", + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", + "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\", + "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -79,7 +80,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json" } } } diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props index 1ab7de77..50301f3c 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\44673\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\AIJXZ\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.5.0 + 6.6.0 - - + + \ No newline at end of file diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json b/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json index 04533356..fd3f0fd6 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json @@ -3033,23 +3033,24 @@ ] }, "packageFolders": { - "C:\\Users\\44673\\.nuget\\packages\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\AIJXZ\\.nuget\\packages\\": {}, + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", + "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", "projectName": "Win.Abp.Snowflakes", - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", - "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\", - "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\", + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", + "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\", + "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -3111,7 +3112,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json" } } } diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache index 2898a6b1..d314d67a 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache @@ -1,67 +1,71 @@ { "version": 2, +<<<<<<< HEAD "dgSpecHash": "nH1pRrQe3k1fNoF9X1jN0LTmtNwHI243FAtfoHxtwvv4NwVPUgW1N4eVt9Rh3jt7mxkxf8r8b0SCtQuENreyPg==", +======= + "dgSpecHash": "CugfBKjayiD+GhmotTe3At90iFNx0Pi6XhbVBO993irp5Dtb+LKaC/9V7bidoTRT9vBbQnaftq7cMvEHm+sOcQ==", +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 "success": true, - "projectFilePath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", + "projectFilePath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj", "expectedPackageFiles": [ - "C:\\Users\\44673\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.collections.immutable\\1.7.1\\system.collections.immutable.1.7.1.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512" + "C:\\Users\\AIJXZ\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections.immutable\\1.7.1\\system.collections.immutable.1.7.1.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll index 6000666b..0bd19b79 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll and b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll differ diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb index 066047d2..1fb666e5 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb and b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb differ diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll index 77d84cd0..e5a978b7 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll and b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll differ diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb index be4ac496..aa15f20e 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb and b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec b/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec index fa9e8bae..7470c409 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec +++ b/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache index af86b3fc..e92d2da9 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache index 489ffc96..ae4569ee 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache index b8637176..5819edd2 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache +++ b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ed642ce8f13672efffb52777c3a6e2e049c8c8a0 +207505d8295abecb2985ab9cc68f97b4e99da693 diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt index 7f81ebc4..8aa9d1eb 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt +++ b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt @@ -73,3 +73,18 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\refint\Win.Sfs.Shared.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.pdb D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\ref\Win.Sfs.Shared.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.deps.json +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Utils.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.csproj.AssemblyReference.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.AssemblyInfoInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.AssemblyInfo.cs +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.csproj.CoreCompileInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.csproj.CopyComplete +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\refint\Win.Sfs.Shared.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\ref\Win.Sfs.Shared.dll diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll index 6000666b..0bd19b79 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb index 066047d2..1fb666e5 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll index 176a88a8..375bf980 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll index 176a88a8..375bf980 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec b/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec index eb9c156a..787f6478 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec +++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec @@ -18,6 +18,10 @@ +<<<<<<< HEAD +======= + +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 \ No newline at end of file diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig index 68b3951e..6b6a47f5 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig +++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,8 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Win.Sfs.Shared +<<<<<<< HEAD build_property.ProjectDir = D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\ +======= +build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\ +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache index d7d0b9b7..1e419b3b 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache +++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD a325aeab955c769b379a1ba9b12c53e4e2b1b118 +======= +8a6f228ed99df16b22ecd182ac4900fcaf732b98 +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt index 1716cf31..86bc703e 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt +++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt @@ -28,6 +28,7 @@ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.dll C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\ref\Win.Sfs.Shared.dll C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.pdb +<<<<<<< HEAD D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.deps.json D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.pdb @@ -43,3 +44,20 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\refint\Win.Sfs.Shared.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.pdb D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\ref\Win.Sfs.Shared.dll +======= +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.deps.json +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Utils.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.AssemblyReference.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.AssemblyInfoInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.AssemblyInfo.cs +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.CoreCompileInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.CopyComplete +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\refint\Win.Sfs.Shared.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\ref\Win.Sfs.Shared.dll +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json index 9d1c436d..c40c581c 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json +++ b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json @@ -1,23 +1,24 @@ { "format": 1, "restore": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": {} + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": {} }, "projects": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": { + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": { "version": "2.0.0", "restore": { - "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", + "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", "projectName": "Win.Sfs.Shared", - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", - "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\", - "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\", + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", + "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\", + "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -31,8 +32,8 @@ "net5.0": { "targetAlias": "netcoreapp5", "projectReferences": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj" + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj" } } } @@ -102,24 +103,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json" } } }, - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { "version": "2.0.0", "restore": { - "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", + "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", "projectName": "Win.Utils", - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", - "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\", - "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\", + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", + "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\", + "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -184,7 +186,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json" } } } diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props index f1aecf4a..9b133244 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props +++ b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props @@ -5,20 +5,20 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\44673\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\AIJXZ\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.5.0 + 6.6.0 - - + + - C:\Users\44673\.nuget\packages\microsoft.codeanalysis.analyzers\1.1.0 - C:\Users\44673\.nuget\packages\microsoft.aspnetcore.razor.design\2.2.0 + C:\Users\AIJXZ\.nuget\packages\microsoft.codeanalysis.analyzers\1.1.0 + C:\Users\AIJXZ\.nuget\packages\microsoft.aspnetcore.razor.design\2.2.0 \ No newline at end of file diff --git a/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json b/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json index 7cf4a2dc..931d96dc 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json +++ b/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json @@ -10453,23 +10453,24 @@ ] }, "packageFolders": { - "C:\\Users\\44673\\.nuget\\packages\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\AIJXZ\\.nuget\\packages\\": {}, + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "2.0.0", "restore": { - "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", + "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", "projectName": "Win.Sfs.Shared", - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", - "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\", - "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\", + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", + "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\", + "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -10483,8 +10484,8 @@ "net5.0": { "targetAlias": "netcoreapp5", "projectReferences": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj" + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj" } } } @@ -10554,7 +10555,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json" } } } diff --git a/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache b/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache index fd254130..bd11f7f0 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache +++ b/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache @@ -1,238 +1,242 @@ { "version": 2, +<<<<<<< HEAD "dgSpecHash": "juXrL2mGZYX6s8pTxI6G0h7O1GH6Nckm6muKMrxEeCehmhryhwv8DbONr7KS08JqwbFf8yLvcAZnkaZ2UakS+A==", +======= + "dgSpecHash": "YxWkVDyhWFjf95al3WbSvLTD3Pa1UMd4u6VwOz5Yl6lkiH07Mi9tVwVsezzQ58LB8GI+hIKMra10XjH1QN894g==", +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 "success": true, - "projectFilePath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", + "projectFilePath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj", "expectedPackageFiles": [ - "C:\\Users\\44673\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.antiforgery\\2.2.0\\microsoft.aspnetcore.antiforgery.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authentication.abstractions\\2.2.0\\microsoft.aspnetcore.authentication.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authentication.core\\2.2.0\\microsoft.aspnetcore.authentication.core.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authorization\\5.0.0\\microsoft.aspnetcore.authorization.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authorization.policy\\2.2.0\\microsoft.aspnetcore.authorization.policy.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.cors\\2.2.0\\microsoft.aspnetcore.cors.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.diagnostics.abstractions\\2.2.0\\microsoft.aspnetcore.diagnostics.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.html.abstractions\\2.2.0\\microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.0\\microsoft.aspnetcore.http.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http.extensions\\2.2.0\\microsoft.aspnetcore.http.extensions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\2.2.0\\microsoft.aspnetcore.jsonpatch.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.localization\\2.2.0\\microsoft.aspnetcore.localization.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.metadata\\5.0.0\\microsoft.aspnetcore.metadata.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc\\2.2.0\\microsoft.aspnetcore.mvc.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.analyzers\\2.2.0\\microsoft.aspnetcore.mvc.analyzers.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.apiexplorer\\2.2.0\\microsoft.aspnetcore.mvc.apiexplorer.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.core\\2.2.0\\microsoft.aspnetcore.mvc.core.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.cors\\2.2.0\\microsoft.aspnetcore.mvc.cors.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.dataannotations\\2.2.0\\microsoft.aspnetcore.mvc.dataannotations.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.formatters.json\\2.2.0\\microsoft.aspnetcore.mvc.formatters.json.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.localization\\2.2.0\\microsoft.aspnetcore.mvc.localization.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor\\2.2.0\\microsoft.aspnetcore.mvc.razor.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor.extensions\\2.2.0\\microsoft.aspnetcore.mvc.razor.extensions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.razorpages\\2.2.0\\microsoft.aspnetcore.mvc.razorpages.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.taghelpers\\2.2.0\\microsoft.aspnetcore.mvc.taghelpers.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.viewfeatures\\2.2.0\\microsoft.aspnetcore.mvc.viewfeatures.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor\\2.2.0\\microsoft.aspnetcore.razor.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor.design\\2.2.0\\microsoft.aspnetcore.razor.design.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor.language\\2.2.0\\microsoft.aspnetcore.razor.language.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor.runtime\\2.2.0\\microsoft.aspnetcore.razor.runtime.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.responsecaching.abstractions\\2.2.0\\microsoft.aspnetcore.responsecaching.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.routing\\2.2.0\\microsoft.aspnetcore.routing.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\1.1.0\\microsoft.codeanalysis.analyzers.1.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.common\\2.8.0\\microsoft.codeanalysis.common.2.8.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.csharp\\2.8.0\\microsoft.codeanalysis.csharp.2.8.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.razor\\2.2.0\\microsoft.codeanalysis.razor.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.dotnet.platformabstractions\\2.1.0\\microsoft.dotnet.platformabstractions.2.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore\\5.0.0\\microsoft.entityframeworkcore.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\5.0.0\\microsoft.entityframeworkcore.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\5.0.0\\microsoft.entityframeworkcore.analyzers.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\5.0.0\\microsoft.entityframeworkcore.relational.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.dependencymodel\\2.1.0\\microsoft.extensions.dependencymodel.2.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.composite\\5.0.0\\microsoft.extensions.fileproviders.composite.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.embedded\\5.0.0\\microsoft.extensions.fileproviders.embedded.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.webencoders\\2.2.0\\microsoft.extensions.webencoders.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.win32.registry\\4.5.0\\microsoft.win32.registry.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\newtonsoft.json.bson\\1.0.1\\newtonsoft.json.bson.1.0.1.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.collections.immutable\\5.0.0\\system.collections.immutable.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.componentmodel.annotations\\5.0.0\\system.componentmodel.annotations.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.diagnosticsource\\5.0.0\\system.diagnostics.diagnosticsource.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.fileversioninfo\\4.3.0\\system.diagnostics.fileversioninfo.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.metadata\\1.4.2\\system.reflection.metadata.1.4.2.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding.codepages\\4.3.0\\system.text.encoding.codepages.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.threading.tasks.extensions\\4.5.1\\system.threading.tasks.extensions.4.5.1.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.threading.thread\\4.3.0\\system.threading.thread.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.valuetuple\\4.3.0\\system.valuetuple.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.xml.xpath\\4.3.0\\system.xml.xpath.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.xml.xpath.xdocument\\4.3.0\\system.xml.xpath.xdocument.4.3.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\timezoneconverter\\3.2.0\\timezoneconverter.3.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.auditing\\4.0.0\\volo.abp.auditing.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.authorization\\4.0.0\\volo.abp.authorization.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.caching\\4.0.0\\volo.abp.caching.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.data\\4.0.0\\volo.abp.data.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.ddd.application\\4.0.0\\volo.abp.ddd.application.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.ddd.application.contracts\\4.0.0\\volo.abp.ddd.application.contracts.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.ddd.domain\\4.0.0\\volo.abp.ddd.domain.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.entityframeworkcore\\4.0.0\\volo.abp.entityframeworkcore.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.eventbus\\4.0.0\\volo.abp.eventbus.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.exceptionhandling\\4.0.0\\volo.abp.exceptionhandling.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.features\\4.0.0\\volo.abp.features.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.guids\\4.0.0\\volo.abp.guids.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.http.abstractions\\4.0.0\\volo.abp.http.abstractions.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.json\\4.0.0\\volo.abp.json.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.localization\\4.0.0\\volo.abp.localization.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.localization.abstractions\\4.0.0\\volo.abp.localization.abstractions.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.multitenancy\\4.0.0\\volo.abp.multitenancy.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.objectextending\\4.0.0\\volo.abp.objectextending.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.objectmapping\\4.0.0\\volo.abp.objectmapping.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.security\\4.0.0\\volo.abp.security.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.serialization\\4.0.0\\volo.abp.serialization.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.settings\\4.0.0\\volo.abp.settings.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.specifications\\4.0.0\\volo.abp.specifications.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.threading\\4.0.0\\volo.abp.threading.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.timing\\4.0.0\\volo.abp.timing.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.uow\\4.0.0\\volo.abp.uow.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.validation\\4.0.0\\volo.abp.validation.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.validation.abstractions\\4.0.0\\volo.abp.validation.abstractions.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\volo.abp.virtualfilesystem\\4.0.0\\volo.abp.virtualfilesystem.4.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512" + "C:\\Users\\AIJXZ\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.antiforgery\\2.2.0\\microsoft.aspnetcore.antiforgery.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authentication.abstractions\\2.2.0\\microsoft.aspnetcore.authentication.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authentication.core\\2.2.0\\microsoft.aspnetcore.authentication.core.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authorization\\5.0.0\\microsoft.aspnetcore.authorization.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authorization.policy\\2.2.0\\microsoft.aspnetcore.authorization.policy.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.cors\\2.2.0\\microsoft.aspnetcore.cors.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.diagnostics.abstractions\\2.2.0\\microsoft.aspnetcore.diagnostics.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.html.abstractions\\2.2.0\\microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.0\\microsoft.aspnetcore.http.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http.extensions\\2.2.0\\microsoft.aspnetcore.http.extensions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\2.2.0\\microsoft.aspnetcore.jsonpatch.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.localization\\2.2.0\\microsoft.aspnetcore.localization.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.metadata\\5.0.0\\microsoft.aspnetcore.metadata.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc\\2.2.0\\microsoft.aspnetcore.mvc.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.analyzers\\2.2.0\\microsoft.aspnetcore.mvc.analyzers.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.apiexplorer\\2.2.0\\microsoft.aspnetcore.mvc.apiexplorer.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.core\\2.2.0\\microsoft.aspnetcore.mvc.core.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.cors\\2.2.0\\microsoft.aspnetcore.mvc.cors.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.dataannotations\\2.2.0\\microsoft.aspnetcore.mvc.dataannotations.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.formatters.json\\2.2.0\\microsoft.aspnetcore.mvc.formatters.json.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.localization\\2.2.0\\microsoft.aspnetcore.mvc.localization.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor\\2.2.0\\microsoft.aspnetcore.mvc.razor.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor.extensions\\2.2.0\\microsoft.aspnetcore.mvc.razor.extensions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.razorpages\\2.2.0\\microsoft.aspnetcore.mvc.razorpages.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.taghelpers\\2.2.0\\microsoft.aspnetcore.mvc.taghelpers.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.viewfeatures\\2.2.0\\microsoft.aspnetcore.mvc.viewfeatures.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor\\2.2.0\\microsoft.aspnetcore.razor.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor.design\\2.2.0\\microsoft.aspnetcore.razor.design.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor.language\\2.2.0\\microsoft.aspnetcore.razor.language.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor.runtime\\2.2.0\\microsoft.aspnetcore.razor.runtime.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.responsecaching.abstractions\\2.2.0\\microsoft.aspnetcore.responsecaching.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.routing\\2.2.0\\microsoft.aspnetcore.routing.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\1.1.0\\microsoft.codeanalysis.analyzers.1.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.common\\2.8.0\\microsoft.codeanalysis.common.2.8.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.csharp\\2.8.0\\microsoft.codeanalysis.csharp.2.8.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.razor\\2.2.0\\microsoft.codeanalysis.razor.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.dotnet.platformabstractions\\2.1.0\\microsoft.dotnet.platformabstractions.2.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore\\5.0.0\\microsoft.entityframeworkcore.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\5.0.0\\microsoft.entityframeworkcore.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\5.0.0\\microsoft.entityframeworkcore.analyzers.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\5.0.0\\microsoft.entityframeworkcore.relational.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencymodel\\2.1.0\\microsoft.extensions.dependencymodel.2.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.composite\\5.0.0\\microsoft.extensions.fileproviders.composite.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.embedded\\5.0.0\\microsoft.extensions.fileproviders.embedded.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.webencoders\\2.2.0\\microsoft.extensions.webencoders.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.registry\\4.5.0\\microsoft.win32.registry.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\newtonsoft.json.bson\\1.0.1\\newtonsoft.json.bson.1.0.1.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections.immutable\\5.0.0\\system.collections.immutable.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.componentmodel.annotations\\5.0.0\\system.componentmodel.annotations.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.diagnosticsource\\5.0.0\\system.diagnostics.diagnosticsource.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.fileversioninfo\\4.3.0\\system.diagnostics.fileversioninfo.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.metadata\\1.4.2\\system.reflection.metadata.1.4.2.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding.codepages\\4.3.0\\system.text.encoding.codepages.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.1\\system.threading.tasks.extensions.4.5.1.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.thread\\4.3.0\\system.threading.thread.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.valuetuple\\4.3.0\\system.valuetuple.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xpath\\4.3.0\\system.xml.xpath.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xpath.xdocument\\4.3.0\\system.xml.xpath.xdocument.4.3.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\timezoneconverter\\3.2.0\\timezoneconverter.3.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.auditing\\4.0.0\\volo.abp.auditing.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.authorization\\4.0.0\\volo.abp.authorization.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.caching\\4.0.0\\volo.abp.caching.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.data\\4.0.0\\volo.abp.data.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.ddd.application\\4.0.0\\volo.abp.ddd.application.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.ddd.application.contracts\\4.0.0\\volo.abp.ddd.application.contracts.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.ddd.domain\\4.0.0\\volo.abp.ddd.domain.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.entityframeworkcore\\4.0.0\\volo.abp.entityframeworkcore.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.eventbus\\4.0.0\\volo.abp.eventbus.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.exceptionhandling\\4.0.0\\volo.abp.exceptionhandling.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.features\\4.0.0\\volo.abp.features.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.guids\\4.0.0\\volo.abp.guids.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.http.abstractions\\4.0.0\\volo.abp.http.abstractions.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.json\\4.0.0\\volo.abp.json.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.localization\\4.0.0\\volo.abp.localization.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.localization.abstractions\\4.0.0\\volo.abp.localization.abstractions.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.multitenancy\\4.0.0\\volo.abp.multitenancy.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.objectextending\\4.0.0\\volo.abp.objectextending.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.objectmapping\\4.0.0\\volo.abp.objectmapping.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.security\\4.0.0\\volo.abp.security.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.serialization\\4.0.0\\volo.abp.serialization.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.settings\\4.0.0\\volo.abp.settings.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.specifications\\4.0.0\\volo.abp.specifications.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.threading\\4.0.0\\volo.abp.threading.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.timing\\4.0.0\\volo.abp.timing.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.uow\\4.0.0\\volo.abp.uow.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.validation\\4.0.0\\volo.abp.validation.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.validation.abstractions\\4.0.0\\volo.abp.validation.abstractions.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.virtualfilesystem\\4.0.0\\volo.abp.virtualfilesystem.4.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll index 77d84cd0..e5a978b7 100644 Binary files a/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll and b/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll differ diff --git a/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb index be4ac496..aa15f20e 100644 Binary files a/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb and b/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb differ diff --git a/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec b/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec index 202f93a2..049f8fd3 100644 --- a/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec +++ b/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache index c0e9cd2e..b8642489 100644 Binary files a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache and b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache differ diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache index 76e7f2a7..274feef0 100644 Binary files a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache and b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache differ diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache index 08ca0818..5a01a970 100644 --- a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache +++ b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a4e72035fded0506db7de17e77433da7abe83383 +55c6c81ff183b96899eec34541a31f8b3f89817b diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt index da92e8d0..308109e4 100644 --- a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt +++ b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt @@ -58,3 +58,15 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\refint\Win.Utils.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.pdb D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\ref\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.deps.json +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.csproj.AssemblyReference.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.GeneratedMSBuildEditorConfig.editorconfig +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.AssemblyInfoInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.AssemblyInfo.cs +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.csproj.CoreCompileInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\refint\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\ref\Win.Utils.dll diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll index 77d84cd0..e5a978b7 100644 Binary files a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll and b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll differ diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb index be4ac496..aa15f20e 100644 Binary files a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb and b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb differ diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll index 3be2c45a..c4d6571b 100644 Binary files a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll and b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll differ diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll index 3be2c45a..c4d6571b 100644 Binary files a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll and b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll differ diff --git a/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec b/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec index b5f294e7..762d11d0 100644 --- a/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec +++ b/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec @@ -13,6 +13,10 @@ +<<<<<<< HEAD +======= + +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 \ No newline at end of file diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig index 70f70bdd..734f1997 100644 --- a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig +++ b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,8 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Win.Utils +<<<<<<< HEAD build_property.ProjectDir = D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\ +======= +build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\ +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache index 26b58660..c2095410 100644 --- a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache +++ b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD fae5eb3acd0d3248e6bebd7afd673170a9c546d0 +======= +2677542b53154846c4624028c80c73e68df285b6 +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt index f68d5611..681a8e5f 100644 --- a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt +++ b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt @@ -22,6 +22,7 @@ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.dll C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\ref\Win.Utils.dll C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.pdb +<<<<<<< HEAD D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.deps.json D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.pdb @@ -34,3 +35,17 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\refint\Win.Utils.dll D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.pdb D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\ref\Win.Utils.dll +======= +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.deps.json +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.csproj.AssemblyReference.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.GeneratedMSBuildEditorConfig.editorconfig +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.AssemblyInfoInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.AssemblyInfo.cs +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.csproj.CoreCompileInputs.cache +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\refint\Win.Utils.dll +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.pdb +D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\ref\Win.Utils.dll +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 diff --git a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json index ef052c07..26c23f14 100644 --- a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json +++ b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json @@ -1,23 +1,24 @@ { "format": 1, "restore": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {} + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {} }, "projects": { - "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { + "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": { "version": "2.0.0", "restore": { - "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", + "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", "projectName": "Win.Utils", - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", - "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\", - "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\", + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", + "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\", + "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -82,7 +83,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json" } } } diff --git a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props index 1ab7de77..50301f3c 100644 --- a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props +++ b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\44673\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\AIJXZ\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.5.0 + 6.6.0 - - + + \ No newline at end of file diff --git a/code/src/Shared/Win.Utils/obj/project.assets.json b/code/src/Shared/Win.Utils/obj/project.assets.json index 810d9635..763239fb 100644 --- a/code/src/Shared/Win.Utils/obj/project.assets.json +++ b/code/src/Shared/Win.Utils/obj/project.assets.json @@ -623,23 +623,24 @@ ] }, "packageFolders": { - "C:\\Users\\44673\\.nuget\\packages\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\AIJXZ\\.nuget\\packages\\": {}, + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "2.0.0", "restore": { - "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", + "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", "projectName": "Win.Utils", - "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", - "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\", - "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\", + "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", + "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\", + "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -704,7 +705,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json" } } } diff --git a/code/src/Shared/Win.Utils/obj/project.nuget.cache b/code/src/Shared/Win.Utils/obj/project.nuget.cache index 80c207d7..dadd7b88 100644 --- a/code/src/Shared/Win.Utils/obj/project.nuget.cache +++ b/code/src/Shared/Win.Utils/obj/project.nuget.cache @@ -1,26 +1,30 @@ { "version": 2, +<<<<<<< HEAD "dgSpecHash": "VZ9unMPAmcdhkbwLdI4sHfCuFhtegoNGzOSHMLpGk+Cs+9KGuocAH1FbPYwMNt5FgvhiTQnIDZKl/bWvU5Sy0A==", +======= + "dgSpecHash": "/s0O/G1fvmGIgzlfjHQ1mMCF4/OyM97pp2HaI56WAq6nZmbhnGfrZpOCy9XfMZWFSuewPbda3y0gRzHPdJF3rw==", +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 "success": true, - "projectFilePath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", + "projectFilePath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj", "expectedPackageFiles": [ - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512", - "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512" + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512", + "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/code/src/SmartFactorySuite.sln b/code/src/SmartFactorySuite.sln index f8cdfd53..13867d31 100644 --- a/code/src/SmartFactorySuite.sln +++ b/code/src/SmartFactorySuite.sln @@ -1,6 +1,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 +<<<<<<< HEAD VisualStudioVersion = 17.5.33516.290 +======= +VisualStudioVersion = 17.6.33815.320 +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gateways", "Gateways", "{593B8559-1521-4E54-A7DF-7F58E5F6EA86}" EndProject @@ -64,7 +68,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.HttpApi", "Modu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.HttpApi.Client", "Modules\BaseService\BaseService.HttpApi.Client\BaseService.HttpApi.Client.csproj", "{1913786D-E64D-48E4-98A7-42C3BCA9C282}" EndProject +<<<<<<< HEAD Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{C94F578D-C331-4A9D-B001-93DAECB51447}" +======= +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}" +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -156,10 +164,17 @@ Global {1913786D-E64D-48E4-98A7-42C3BCA9C282}.Debug|Any CPU.Build.0 = Debug|Any CPU {1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.ActiveCfg = Release|Any CPU {1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.Build.0 = Release|Any CPU +<<<<<<< HEAD {C94F578D-C331-4A9D-B001-93DAECB51447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C94F578D-C331-4A9D-B001-93DAECB51447}.Debug|Any CPU.Build.0 = Debug|Any CPU {C94F578D-C331-4A9D-B001-93DAECB51447}.Release|Any CPU.ActiveCfg = Release|Any CPU {C94F578D-C331-4A9D-B001-93DAECB51447}.Release|Any CPU.Build.0 = Release|Any CPU +======= + {4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.Build.0 = Release|Any CPU +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -190,7 +205,11 @@ Global {56B50817-0F64-4CD8-814D-CA3827F40FFB} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1} {65DEB438-557B-4268-8EC6-25A9A2ED6FE1} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1} {1913786D-E64D-48E4-98A7-42C3BCA9C282} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1} +<<<<<<< HEAD {C94F578D-C331-4A9D-B001-93DAECB51447} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27} +======= + {4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27} +>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CAAF5A4A-B83D-4CCD-BF50-58035AD87837} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs index 66af8b40..8aa828cf 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs @@ -17,7 +17,7 @@ public class BBAC_DNController : GenericController public List Items { get; set; } = new List(); public bool QueryAll { get; set; } public TSearchModel Query { get; set; } = Activator.CreateInstance(); + public List Filters { get; set; } = new List(); } diff --git a/docs/demo/src/WTA.Shared/Application/QueryFilter.cs b/docs/demo/src/WTA.Shared/Application/QueryFilter.cs new file mode 100644 index 00000000..f5ce52cf --- /dev/null +++ b/docs/demo/src/WTA.Shared/Application/QueryFilter.cs @@ -0,0 +1,9 @@ +namespace WTA.Shared.Application; + +public class QueryFilter +{ + public string Property { get; set; } = null!; + public string Operator { get; set; } = null!; + public string Value { get; set; } = null!; + public string Logic { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Shared/Attributes/OneToOneAttribute.cs b/docs/demo/src/WTA.Shared/Attributes/OneToOneAttribute.cs new file mode 100644 index 00000000..1c9a4bf5 --- /dev/null +++ b/docs/demo/src/WTA.Shared/Attributes/OneToOneAttribute.cs @@ -0,0 +1,14 @@ +namespace WTA.Shared.Attributes; + +[AttributeUsage(AttributeTargets.Property)] +public class OneToOneAttribute : Attribute, ITypeAttribute +{ + public Type Type { get; set; } = null!; + public string? Property { get; } + + public OneToOneAttribute(string? property = null) + { + this.Type = typeof(TEntity); + this.Property = property; + } +} diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs index 12960a6a..cea4d81c 100644 --- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs +++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs @@ -1,11 +1,16 @@ +using System.ComponentModel.DataAnnotations; +using System.Globalization; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using WTA.Shared.Application; using WTA.Shared.Attributes; using WTA.Shared.Data; using WTA.Shared.Domain; +using WTA.Shared.ExportImport; using WTA.Shared.Extensions; using WTA.Shared.Mappers; @@ -68,14 +73,23 @@ public class GenericController.ParentId)},{nameof(BaseEntity.Order)},{nameof(BaseEntity.CreatedOn)}"; } - return query; } + [HttpGet] + public IActionResult Details() + { + return Json(typeof(TModel).GetMetadataForType()); + } + [HttpPost, Order(-2), HtmlClass("el-button--primary")] public virtual IActionResult Details(Guid id) { @@ -87,7 +101,11 @@ public class GenericController(), + }); } [HttpPost, Multiple, Order(-3), HtmlClass("el-button--success")] @@ -163,11 +181,33 @@ public class GenericController(); + return exportImportService.GetImportTemplate(); + } + catch (Exception ex) + { + return Problem(ex.Message); + } + } + + [Consumes("multipart/form-data")] [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")] - public virtual IActionResult Import(IFormFile importexcelfile) + public virtual IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) { try { + var exportImportService = this.HttpContext.RequestServices.GetRequiredService(); + var list = exportImportService.Import(file.OpenReadStream()); + list.ForEach(item => + { + this.Repository.Insert(item.ToObject()); + }); + this.Repository.SaveChanges(); return NoContent(); } catch (Exception ex) @@ -191,7 +231,8 @@ public class GenericController(); + return exportImportService.Export(query.ToList().Select(o => o.ToObject()).ToList()); } catch (Exception ex) { diff --git a/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs b/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs index 291495a5..581b6d13 100644 --- a/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs +++ b/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs @@ -112,7 +112,7 @@ public abstract class BaseDbContext : DbContext where T : DbContext if (entityType.IsAssignableTo(typeof(BaseEntity))) { //软删除、租户过滤 - this.GetType().GetMethod(nameof(this.CreateQueryFilter))?.MakeGenericMethod(entityType).Invoke(this, new object[] { modelBuilder }); + //this.GetType().GetMethod(nameof(this.CreateQueryFilter))?.MakeGenericMethod(entityType).Invoke(this, new object[] { modelBuilder }); // //基类 entityTypeBuilder.HasKey(nameof(BaseEntity.Id)); diff --git a/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs b/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs index 02dfcfc7..4f735756 100644 --- a/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs +++ b/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs @@ -5,8 +5,8 @@ using ClosedXML.Excel; using ClosedXML.Graphics; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Microsoft.OpenApi.Extensions; using WTA.Shared.Attributes; +using WTA.Shared.Extensions; namespace WTA.Shared.ExportImport; @@ -18,7 +18,7 @@ public class ClosedXmlExportImportService : IExportImportService static ClosedXmlExportImportService() { - using var fallbackFontStream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"{WebApp.Current.Prefix}.Infrastructure.Resources.calibril.ttf"); + using var fallbackFontStream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(WTA.Shared.Resources.Resource).Namespace}.font.ttf"); LoadOptions.DefaultGraphicEngine = DefaultGraphicEngine.CreateWithFontsAndSystemFonts(fallbackFontStream); } @@ -32,12 +32,32 @@ public class ClosedXmlExportImportService : IExportImportService try { using var workbook = new XLWorkbook(); - var name = typeof(TExportModel).GetCustomAttribute()?.Name ?? typeof(TExportModel).Name; + var name = typeof(TExportModel).GetDisplayName(); var fileName = $"{name}_导出.xlsx"; var ws = workbook.Worksheets.Add(name); - ws.Style.Font.FontName = "宋体"; // - //Internal + var type = typeof(TExportModel); + var propertyList = GetProperties(type); + var rowIndex = 1; + for (var i = 0; i < propertyList.Length; i++) + { + var property = propertyList[i]; + var columnIndex = i + 1; + var cell = ws.Cell(1, columnIndex); + cell.Value = property.GetDisplayName(); + } + list.ForEach(model => + { + rowIndex++; + for (var i = 0; i < propertyList.Length; i++) + { + var property = propertyList[i]; + var columnIndex = i + 1; + var value = property.GetValue(model)?.ToString(); + var cell = ws.Cell(rowIndex, columnIndex); + SetCell(model, cell, property); + } + }); // var stream = new MemoryStream(); workbook.SaveAs(stream); @@ -57,19 +77,38 @@ public class ClosedXmlExportImportService : IExportImportService public FileContentResult GetImportTemplate() { - //TModelType=>File - throw new NotImplementedException(); + using var workbook = new XLWorkbook(); + var type = typeof(TImportModel); + var name = type.GetDisplayName(); + var fileName = $"{name}_导入模板.xlsx"; + var ws = workbook.Worksheets.Add(name); + var properties = GetProperties(type); + for (var i = 0; i < properties.Length; i++) + { + var property = properties[i]; + var headerName = property.GetDisplayName(); + var cell = ws.Cell(1, i + 1); + cell.Value = headerName; + } + var stream = new MemoryStream(); + workbook.SaveAs(stream); + stream.Seek(0, SeekOrigin.Begin); + var result = new FileContentResult(stream.ToArray(), ContentType) + { + FileDownloadName = fileName + }; + return result; } - public IList Import(byte[] bytes) + public IList Import(Stream stream) { try { var result = new List(); // - using var workbook = new XLWorkbook(new MemoryStream(bytes)); + using var workbook = new XLWorkbook(stream); var type = typeof(TImportModel); - var properties = GetPropertiesForImportModel(type).ToDictionary(o => o.GetCustomAttribute()?.Name ?? o.GetCustomAttribute()?.Name ?? o.Name); + var properties = GetProperties(type).ToDictionary(o => o.GetCustomAttribute()?.Name ?? o.GetDisplayName() ?? o.Name); var name = type.GetCustomAttribute()?.Name ?? typeof(TImportModel).Name; var ws = workbook.Worksheets.FirstOrDefault(); if (ws != null) @@ -83,40 +122,12 @@ public class ClosedXmlExportImportService : IExportImportService { var columnIndex = j + 1; var cell = row.Cell(columnIndex); - var value = cell.Value; - if (value.ToString() != "") + var headerName = ws.Cell(1, columnIndex).Value.ToString().Trim(); + + var value = cell.Value.ToString().Trim(); + if (!string.IsNullOrEmpty(value) && properties.TryGetValue(headerName, out var property)) { - var headerName = ws.Cell(1, columnIndex).Value.ToString().Trim(); - properties.TryGetValue(headerName, out var property); - if (property != null) - { - var propertyType = property.PropertyType; - if (propertyType.IsEnum) - { - var enumValue = Enum.GetNames(propertyType) - .Select(o => new KeyValuePair(o, (Enum)Enum.Parse(propertyType, o))) - .Where(o => o.Value.GetDisplayName() == value.ToString()) - .Select(o => o.Value) - .FirstOrDefault(); - property.SetValue(model, enumValue); - } - else if (propertyType.Name == nameof(Boolean)) - { - if (value.GetText() == "是") - { - property.SetValue(model, true); - } - else - { - property.SetValue(model, false); - } - } - else - { - var propertyValue = Convert.ChangeType(value.ToString(), propertyType, CultureInfo.InvariantCulture); - property.SetValue(model, propertyValue); - } - } + SetProperty(model, property, value); } } result.Add(model); @@ -131,10 +142,79 @@ public class ClosedXmlExportImportService : IExportImportService } } - private static PropertyInfo[] GetPropertiesForImportModel(Type type) + private static PropertyInfo[] GetProperties(Type type) { - return type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty) - .Where(o => o.GetCustomAttribute(true) == null || !o.GetCustomAttribute()!.IsIgnore) + var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty); + return properties + .Where(o => o.PropertyType == typeof(string) || o.PropertyType.IsNullableType() || o.PropertyType.IsValueType) + .Where(o => !o.GetCustomAttributes(true).Any()) + .Where(o => !o.GetCustomAttributes(true).Any() || !o.GetCustomAttribute(true)!.IsIgnore) .ToArray(); } + + /// + /// 导出设置单元格 + /// + private static void SetCell(TExportModel? model, IXLCell cell, PropertyInfo property) + { + var propertyType = property.PropertyType.GetUnderlyingType(); + var value = property.GetValue(model)?.ToString()?.Trim(); + if (string.IsNullOrEmpty(value)) + { + return; + } + if (propertyType == typeof(bool)) + { + cell.Value = (bool)property.GetValue(model)! ? "是" : "否"; + } + else if (propertyType.IsEnum) + { + cell.Value = (Enum.Parse(propertyType, value) as Enum)?.GetDisplayName(); + } + else if (propertyType == typeof(DateTime)) + { + cell.Value = ((DateTime)property.GetValue(model)!).ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); + } + else + { + cell.Value = value; + } + } + + /// + /// 导入设置属性值 + /// + private static void SetProperty(TImopotModel model, PropertyInfo property, string value) + { + var propertyType = property.PropertyType.GetUnderlyingType(); + if (propertyType.IsEnum) + { + var enumValue = Enum.GetNames(propertyType) + .Select(o => new KeyValuePair(o, (Enum)Enum.Parse(propertyType, o))) + .Where(o => o.Value.GetDisplayName() == value.ToString()) + .Select(o => o.Value) + .FirstOrDefault(); + property.SetValue(model, enumValue); + } + else if (propertyType == typeof(bool)) + { + if (value == "是") + { + property.SetValue(model, true); + } + else + { + property.SetValue(model, false); + } + } + else if (propertyType == typeof(Guid)) + { + property.SetValue(model, Guid.Parse(value)); + } + else + { + var propertyValue = Convert.ChangeType(value.ToString(), propertyType, CultureInfo.InvariantCulture); + property.SetValue(model, propertyValue); + } + } } diff --git a/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs b/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs index adb43efc..864de43d 100644 --- a/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs +++ b/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs @@ -8,5 +8,5 @@ public interface IExportImportService FileContentResult GetImportTemplate(); - IList Import(byte[] bytes); + IList Import(Stream stream); } diff --git a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs index fe319b65..2e26f7e0 100644 --- a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs +++ b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs @@ -133,8 +133,8 @@ public static class JsonSchemaExtensions } schema.AddNotNull("description", meta.Description); - schema.AddNotNull("format", meta.DataTypeName?.ToLowerCamelCase()); - schema.AddNotNull("input", meta.TemplateHint?.ToLowerCamelCase()); + schema.AddNotNull("format", meta.DataTypeName?.ToCamelCase()); + schema.AddNotNull("input", meta.TemplateHint?.ToCamelCase()); if (meta.TemplateHint == "select" && meta.IsEnumerableType && modelType.IsGenericType) { schema.TryAdd("url", modelType.GetGenericArguments().First().Name.ToSlugify()); @@ -152,7 +152,7 @@ public static class JsonSchemaExtensions if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType() == typeof(NavigationAttribute)) is NavigationAttribute navigationAttribute) { var path = navigationAttribute.Property ?? $"{propertyName[..^2]}.Name"; - path = string.Join('.', path.Split('.').Select(o => o.ToLowerCamelCase())); + path = string.Join('.', path.Split('.').Select(o => o.ToCamelCase())); schema.Add("navigation", path); schema.Add("input", "select"); schema.Add("url", defaultModelMetadata.ContainerType?.GetProperty(propertyName[..^2])?.PropertyType.Name.ToSlugify()!); @@ -257,7 +257,7 @@ public static class JsonSchemaExtensions else if (attribute is CompareAttribute compare)//?? { rule.Add("validator", "compare"); - rule.Add("compare", compare.OtherProperty.ToLowerCamelCase()); + rule.Add("compare", compare.OtherProperty.ToCamelCase()); } else if (attribute is MinLengthAttribute minLength) { diff --git a/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs b/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs index ef47474f..2a6948b5 100644 --- a/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs +++ b/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs @@ -57,7 +57,19 @@ public static class StringExtensions return input.EndsWith(end) ? input[..^end.Length] : input; } - public static string ToLowerCamelCase(this string input) + public static string ToPascalCase(this string value) + { + if (!string.IsNullOrEmpty(value)) + { + var sb = new StringBuilder(value); + sb[0] = char.ToUpperInvariant(sb[0]); + + return sb.ToString(); + } + return value; + } + + public static string ToCamelCase(this string input) { if (string.IsNullOrEmpty(input) || !char.IsUpper(input[0])) { diff --git a/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs b/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs index 3dc51c33..f138bc5c 100644 --- a/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs +++ b/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs @@ -34,7 +34,7 @@ public class MonitorHostedService : IHostedService { Debug.WriteLine(ex.ToString()); } - await Task.Delay(1000 * 1).ConfigureAwait(false); + await Task.Delay(5000 * 1).ConfigureAwait(false); } }, cancellationToken); return Task.CompletedTask; diff --git a/docs/demo/src/WTA.Shared/Resources/calibril.ttf b/docs/demo/src/WTA.Shared/Resources/font.ttf similarity index 100% rename from docs/demo/src/WTA.Shared/Resources/calibril.ttf rename to docs/demo/src/WTA.Shared/Resources/font.ttf diff --git a/docs/demo/src/WTA.Shared/WTA.Shared.csproj b/docs/demo/src/WTA.Shared/WTA.Shared.csproj index 35afd276..d85b278d 100644 --- a/docs/demo/src/WTA.Shared/WTA.Shared.csproj +++ b/docs/demo/src/WTA.Shared/WTA.Shared.csproj @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/docs/demo/src/WTA/wwwroot/components/form/index.js b/docs/demo/src/WTA/wwwroot/components/form/index.js index 2a9ed526..01b3f465 100644 --- a/docs/demo/src/WTA/wwwroot/components/form/index.js +++ b/docs/demo/src/WTA/wwwroot/components/form/index.js @@ -55,7 +55,7 @@ export default { }); //} } catch (error) { - console.error(error); + console.log(error); } finally { loading.value = false; } diff --git a/docs/demo/src/WTA/wwwroot/components/icon/index.js b/docs/demo/src/WTA/wwwroot/components/icon/index.js index f8c30689..28253593 100644 --- a/docs/demo/src/WTA/wwwroot/components/icon/index.js +++ b/docs/demo/src/WTA/wwwroot/components/icon/index.js @@ -1,5 +1,6 @@ import html from "html"; import { onMounted, ref } from "vue"; +import { useAppStore } from "../../store/index.js"; export default { template: html`