From db625422c6817db8ef4c83a4318d365749a0377c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Thu, 6 Jul 2023 16:48:57 +0800 Subject: [PATCH] 7.5 update --- .../AuthServer.Host/appsettings.json | 16 +- .../BaseService.Host/appsettings.json | 24 +- .../SettleAccount.HttpApi.Host.csproj | 1 + .../appsettings.json | 45 +- .../Entities/Boms/IBomAppService.cs | 1 - .../EstimatedInventoryDetailCreateDto.cs | 17 - .../EstimatedInventoryDetailDto.cs | 120 - .../EstimatedInventoryDetailDtoBase.cs | 118 - .../EstimatedInventoryDetailExportDto.cs | 151 - .../EstimatedInventoryDetailImportDto.cs | 169 -- .../EstimatedInventoryDetailRequestDto.cs | 107 - .../EstimatedInventoryDetailUpdateDto.cs | 21 - .../EstimatedInventoryVersionDtoBase.cs | 103 - .../IEstimatedInventoryDetailAppService.cs | 138 - .../EstimatedSums/EsimatedSumDtoBase.cs | 356 --- .../EsimatedSumVersionDtoBase.cs | 122 - .../EstimatedSums/IEstimatedSumAppService.cs | 123 - .../Entities/HQExtend/HQKBExtendDto.cs | 273 -- .../Entities/HQ_H/HQ_H_PlatformCreateDto.cs | 15 - .../Entities/HQ_H/HQ_H_PlatformDto.cs | 93 - .../Entities/HQ_H/HQ_H_PlatformDtoBase.cs | 93 - .../Entities/HQ_H/HQ_H_PlatformExportDto.cs | 109 - .../Entities/HQ_H/HQ_H_PlatformImportDto.cs | 109 - .../Entities/HQ_H/HQ_H_PlatformRequestDto.cs | 101 - .../HQ_H/HQ_H_PlatformVersionDtoBase.cs | 100 - .../Entities/HQ_H/IHQ_H_PlatformAppService.cs | 91 - .../Inventories/IInventoryDetailAppService.cs | 1 - .../IItemInvoicePriceAppService.cs | 1 - .../ISecondaryAdjustmentAppService.cs | 137 - .../ISecondaryDiscountAppService.cs | 137 - .../ISecondaryPriceRatioAppService.cs | 135 - .../SecondaryAdjustmentDtoBase.cs | 360 --- .../SecondaryAdjustmentVersionDtoBase.cs | 124 - .../SecondaryDiscountDtoBase.cs | 319 -- .../SecondaryDiscountVersionDtoBase.cs | 124 - .../SecondaryPriceRatioDtoBase.cs | 388 --- .../SecondaryPriceRatioVersionDtoBase.cs | 126 - .../ISettlementCrossReferenceAppService.cs | 110 - .../ImportSettlementCrossReferenceDto.cs | 85 - .../SettlementCrossReferenceCreateDto.cs | 75 - .../SettlementCrossReferenceDto.cs | 75 - .../SettlementCrossReferenceExportDto.cs | 73 - .../SettlementCrossReferenceRequestDto.cs | 85 - .../SettlementCrossReferenceUpdateDto.cs | 75 - .../SettlementCrossReferenceVersionDto.cs | 28 - ...ttlementCrossReferenceVersionRequestDto.cs | 28 - .../ISettlementPakAndSparePartsAppService.cs | 1 - .../ISettlementPartAppService.cs | 1 - .../ISettleAccountAppService.cs | 131 - .../UnSettleAccountCreateDto.cs | 15 - .../UnSettleAccounts/UnSettleAccountDto.cs | 83 - .../UnSettleAccountDtoBase.cs | 73 - .../UnSettleAccountExportDto.cs | 88 - .../UnSettleAccountImportDto.cs | 82 - .../UnSettleAccountRequestDto.cs | 81 - .../UnSettleAccountUpdateDto.cs | 16 - .../UnSettleAccountVersionDtoBase.cs | 103 - .../VWScrapClaims/IScrapClaimsAppService.cs | 94 - .../VWScrapClaims/ScrapClaimsCreateDto.cs | 15 - .../Entities/VWScrapClaims/ScrapClaimsDto.cs | 59 - .../VWScrapClaims/ScrapClaimsDtoBase.cs | 58 - .../VWScrapClaims/ScrapClaimsExportDto.cs | 57 - .../VWScrapClaims/ScrapClaimsImportDto.cs | 55 - .../VWScrapClaims/ScrapClaimsRequestDto.cs | 64 - .../ScrapClaimsVersionDtoBase.cs | 100 - .../VWSparePart/ISparePartAppService.cs | 94 - .../VWSparePart/SparePartCreateDto.cs | 15 - .../Entities/VWSparePart/SparePartDto.cs | 125 - .../Entities/VWSparePart/SparePartDtoBase.cs | 124 - .../VWSparePart/SparePartExportDto.cs | 143 - .../VWSparePart/SparePartImportDto.cs | 129 - .../VWSparePart/SparePartRequestDto.cs | 129 - .../VWSparePart/SparePartVersionDtoBase.cs | 100 - .../WMSKanBan/IWMSVWKanBanAppService.cs | 96 - .../WMSKanBan/WMSVWKanBanCreateDto.cs | 14 - .../Entities/WMSKanBan/WMSVWKanBanDto.cs | 113 - .../Entities/WMSKanBan/WMSVWKanBanDtoBase.cs | 85 - .../WMSKanBan/WMSVWKanBanExportDto.cs | 92 - .../WMSKanBan/WMSVWKanBanImportDto.cs | 93 - .../WMSKanBan/WMSVWKanBanRequestDto.cs | 93 - .../WMSKanBan/WMSVWKanBanVersionDtoBase.cs | 100 - .../WMSKanBan/WMSVWKanBantUpdateDto.cs | 16 - .../WMSSparePart/IWMSSparePartAppService.cs | 91 - .../WMSSparePart/WMSSparePartCreateDto.cs | 14 - .../Entities/WMSSparePart/WMSSparePartDto.cs | 137 - .../WMSSparePart/WMSSparePartDtoBase.cs | 124 - .../WMSSparePart/WMSSparePartExportDto.cs | 143 - .../WMSSparePart/WMSSparePartImportDto.cs | 129 - .../WMSSparePart/WMSSparePartRequestDto.cs | 129 - .../WMSSparePartVersionDtoBase.cs | 100 - .../ErrorListBill/ErrorBillAppService.cs | 2 - .../Entities/HQExtend/HQKBExtendAppService.cs | 347 --- .../HQExtend/HQKBSettleExtendAppService.cs | 346 --- .../Entities/HQ_H/HQ_H_PlatformAppService.cs | 344 --- .../Entities/Materials/MaterialAppService.cs | 2 - .../SettleAccounts/SettleAccountAppService.cs | 14 +- .../SettlementCrossReferenceAppService.cs | 468 --- .../SettlementPakAndSparePartsAppService.cs | 229 -- .../Entities/TaskJobs/JobAppService.cs | 2 - .../UnSettleAccountAppService.cs | 343 --- .../Entities/VWKanBan/VWKanBanAppService.cs | 320 -- .../VWScrapClaims/ScrapClaimsAppService.cs | 316 -- .../VWSparePart/SparePartAppService.cs | 497 ---- .../WMS-KanBan/WMSKanBanAppService.cs | 317 -- .../WMS-SparePart/WMSSparePartAppService.cs | 320 -- .../WMS/WMSCusomerKanbanAppService.cs | 655 ----- .../Entities/WMS/WMSHQFKanbanAppService.cs | 569 ---- .../WMS/WMSHQFSharePartAppService .cs | 579 ---- .../Entities/WMS/WMSHQHKanbanAppService.cs | 633 ---- .../Entities/WMS/WMSHQHSharePartAppService.cs | 635 ---- .../Entities/WMS/WMSJitAppService.cs | 655 ----- .../Entities/WMS/WMSKanbanAppService.cs | 951 ------ .../Entities/WMS/WMSKanbanExtendAppService.cs | 668 ----- .../Entities/WMS/WMSSharePart90AppService.cs | 712 ----- .../Entities/WMS/WMSSharePartAppService.cs | 945 ------ .../Entities/WMS/WmsDetailCancelInterface.cs | 231 -- .../Entities/WMS/WmsDetailUnInterface.cs | 245 -- .../Entities/WMS/WmsHQKBOutputAppService.cs | 544 ---- .../Entities/WMS/WmsHQMKanbanAppService.cs | 490 ---- .../Entities/WMS/WmsHQMSharePartAppService.cs | 587 ---- .../WMS/WmsOneTimeSaleOutputAppService.cs | 464 --- .../Entities/WMS/WmsOutputSumAppService.cs | 157 - .../WMS/WmsOutputSumInterfaceAppService.cs | 243 -- .../Entities/WMS/WmsUnInterface.cs | 426 --- .../Entities/WMS/WmsUnSumInterface.cs | 217 -- .../ImportExcelCommon/ExportImporter.cs | 1 - .../ReportServices/ReportMakeService.cs | 1 - .../SettleAccount.Application.csproj | 4 + ...ttleAccountApplicationAutoMapperProfile.cs | 451 +-- .../EstimatedInventoryDetail.cs | 213 -- .../EstimatedInventoryVersion.cs | 63 - .../Entities/EstimatedSums/EstimatedSum.cs | 107 - .../EstimatedSums/EstimatedSumVersion.cs | 52 - .../Entities/HQExtend/HQKBExtend.cs | 52 - .../Entities/HQExtend/HQKBExtendVersion.cs | 55 - .../Entities/HQExtend/HQKBSettleExtend.cs | 52 - .../HQExtend/HQKBSettleExtendVersion.cs | 55 - .../Entities/HQ_H/HQ_H_Kanban.cs | 86 - .../Entities/HQ_H/HQ_H_Platform.cs | 172 -- .../Entities/HQ_H/HQ_H_PlatformVersion.cs | 47 - .../Entities/KanBan/KanBan.cs | 171 -- .../Entities/KanBan/KanBanManager.cs | 34 - .../Entities/KanBan/KanBanVersion.cs | 51 - .../SecondaryMatching/SecondaryAdjustment.cs | 129 - .../SecondaryAdjustmentVersion.cs | 53 - .../SecondaryMatching/SecondaryDiscount.cs | 116 - .../SecondaryDiscountVersion.cs | 53 - .../SecondaryMatching/SecondaryPriceRatio.cs | 140 - .../SecondaryPriceRatioVersion.cs | 50 - .../SettledPartAndErpPartPriceDiff.cs | 44 - .../SettlementCrossReference.cs | 114 - .../SettlementCrossReferenceVersion.cs | 53 - .../SettlementPakAndSpareParts.cs | 227 -- .../SettlementPakAndSparePartsVersion.cs | 53 - .../UnSettleAccounts/UnSettleAccount.cs | 128 - .../UnSettleAccountVersion.cs | 53 - .../Entities/VWScrapClaims/ScrapClaims.cs | 101 - .../VWScrapClaims/ScrapClaimsVersion.cs | 47 - .../Entities/VWSparePart/SparePart.cs | 215 -- .../Entities/VWSparePart/SparePartVersion.cs | 47 - .../Entities/WMS-KanBan/WMSKanBanManager.cs | 31 - .../Entities/WMS-KanBan/WMSKanBanSettle.cs | 254 -- .../Entities/WMS-KanBan/WMSKanBanVersion.cs | 47 - .../Entities/WMS-KanBan/WmsKanban.cs | 33 - .../Entities/WMS-SparePart/WMSSparePart.cs | 308 -- .../WMS-SparePart/WMSSparePartVersion.cs | 47 - .../Entities/WMS/TB_BILL.cs | 133 - .../Entities/WMS/TS_SORT_DETAIL.cs | 105 - .../Entities/WMS/TaskList.cs | 2613 ----------------- .../Entities/WMS/WmsOutPutPercent.cs | 28 - ...AccountDbContextModelCreatingExtensions.cs | 2613 +---------------- .../SettleAccountEntityFrameworkCoreModule.cs | 7 - .../UnInterfaceDbContext.cs | 3 +- .../WMSDapperRepository.cs | 128 - .../EntityFrameworkCore/WMSDbContext.cs | 48 - .../Report/ErpSumOutputDapperRepository.cs | 253 -- .../SecMatchBaseDapperReportRepository.cs | 1 - ...ettledPartAndErpPartPriceDiffRepository.cs | 127 - .../Report/WmsDapperRepository.cs | 116 - .../SettlementPakAndSparePartRepository.cs | 71 - ...tlementPakAndSparePartVersionRepository.cs | 66 - .../UnSettleAccountRepository.cs | 69 - .../UnSettleAccountVersionRepository.cs | 81 - .../Repository/WMSEfCoreRepository.cs | 162 - .../BlobFileController.cs | 24 - .../Base/SecRelationShipImportService.cs | 506 +--- ...SharePartSettledDetailDiffExportService.cs | 25 +- .../Report/SettleFisDiffExportService.cs | 1 - .../Report/SettleSparePartExportService.cs | 19 +- .../Report/SettleUnSparePartExportService.cs | 47 +- ...ledPartAndErpPartPriceDiffExportService.cs | 5 - .../Services/Report/SyncFisService.cs | 113 +- .../Services/Report/UnSettledSumService.cs | 119 +- .../UnSettleAccountImportService.cs | 36 +- .../SettleAccountJobModule.cs | 5 - .../Debug/netcoreapp5/Win.Abp.Snowflakes.dll | Bin 8192 -> 7680 bytes .../Debug/netcoreapp5/Win.Abp.Snowflakes.pdb | Bin 13328 -> 13260 bytes .../netcoreapp5/Win.Abp.Snowflakes.dll | Bin 7679 -> 7680 bytes .../netcoreapp5/Win.Abp.Snowflakes.pdb | Bin 12868 -> 12936 bytes ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Win.Abp.Snowflakes.assets.cache | Bin 28388 -> 28412 bytes ....Snowflakes.csproj.AssemblyReference.cache | Bin 105262 -> 105262 bytes ....Snowflakes.csproj.CoreCompileInputs.cache | 2 +- ...Abp.Snowflakes.csproj.FileListAbsolute.txt | 12 + .../Debug/netcoreapp5/Win.Abp.Snowflakes.dll | Bin 8192 -> 7680 bytes .../Debug/netcoreapp5/Win.Abp.Snowflakes.pdb | Bin 13328 -> 13260 bytes .../netcoreapp5/ref/Win.Abp.Snowflakes.dll | Bin 5631 -> 5632 bytes .../netcoreapp5/refint/Win.Abp.Snowflakes.dll | Bin 5631 -> 5632 bytes ....GeneratedMSBuildEditorConfig.editorconfig | 9 +- .../Win.Abp.Snowflakes.assets.cache | Bin 22517 -> 28412 bytes ....Snowflakes.csproj.AssemblyReference.cache | Bin 11 -> 105262 bytes ....Snowflakes.csproj.CoreCompileInputs.cache | 2 +- ...Abp.Snowflakes.csproj.FileListAbsolute.txt | 12 + .../netcoreapp5/Win.Abp.Snowflakes.dll | Bin 7679 -> 7680 bytes .../netcoreapp5/Win.Abp.Snowflakes.pdb | Bin 12868 -> 12936 bytes .../netcoreapp5/ref/Win.Abp.Snowflakes.dll | Bin 5631 -> 5632 bytes ...in.Abp.Snowflakes.csproj.nuget.dgspec.json | 21 +- .../Win.Abp.Snowflakes.csproj.nuget.g.props | 8 +- .../obj/project.assets.json | 21 +- .../obj/project.nuget.cache | 120 +- .../bin/Debug/Win.Sfs.Shared.2.0.0.nupkg | Bin 32598 -> 32566 bytes .../bin/Debug/netcoreapp5/Win.Sfs.Shared.dll | Bin 73728 -> 73728 bytes .../bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb | Bin 48756 -> 48512 bytes .../bin/Debug/netcoreapp5/Win.Utils.dll | Bin 10752 -> 10752 bytes .../bin/Debug/netcoreapp5/Win.Utils.pdb | Bin 21840 -> 21764 bytes .../bin/Release/Win.Sfs.Shared.2.0.0.nupkg | Bin 31198 -> 31172 bytes .../Release/netcoreapp5/Win.Sfs.Shared.dll | Bin 70143 -> 70144 bytes .../Release/netcoreapp5/Win.Sfs.Shared.pdb | Bin 45716 -> 45888 bytes .../bin/Release/netcoreapp5/Win.Utils.dll | Bin 10239 -> 10240 bytes .../bin/Release/netcoreapp5/Win.Utils.pdb | Bin 21192 -> 21260 bytes .../obj/Debug/Win.Sfs.Shared.2.0.0.nuspec | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../netcoreapp5/Win.Sfs.Shared.assets.cache | Bin 138041 -> 137770 bytes ....Sfs.Shared.csproj.AssemblyReference.cache | Bin 202480 -> 202272 bytes ....Sfs.Shared.csproj.CoreCompileInputs.cache | 2 +- ...Win.Sfs.Shared.csproj.FileListAbsolute.txt | 15 + .../obj/Debug/netcoreapp5/Win.Sfs.Shared.dll | Bin 73728 -> 73728 bytes .../obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb | Bin 48756 -> 48512 bytes .../Debug/netcoreapp5/ref/Win.Sfs.Shared.dll | Bin 42495 -> 42496 bytes .../netcoreapp5/refint/Win.Sfs.Shared.dll | Bin 42495 -> 42496 bytes .../obj/Release/Win.Sfs.Shared.2.0.0.nuspec | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 9 +- .../netcoreapp5/Win.Sfs.Shared.assets.cache | Bin 111191 -> 137770 bytes ....Sfs.Shared.csproj.AssemblyReference.cache | Bin 11 -> 202276 bytes ....Sfs.Shared.csproj.CoreCompileInputs.cache | 2 +- ...Win.Sfs.Shared.csproj.FileListAbsolute.txt | 15 + .../Release/netcoreapp5/Win.Sfs.Shared.dll | Bin 70143 -> 70144 bytes .../Release/netcoreapp5/Win.Sfs.Shared.pdb | Bin 45716 -> 45888 bytes .../netcoreapp5/ref/Win.Sfs.Shared.dll | Bin 42495 -> 42496 bytes .../Win.Sfs.Shared.csproj.nuget.dgspec.json | 44 +- .../obj/Win.Sfs.Shared.csproj.nuget.g.props | 12 +- .../Win.Sfs.Shared/obj/project.assets.json | 25 +- .../Win.Sfs.Shared/obj/project.nuget.cache | 462 +-- .../Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg | Bin 6543 -> 6503 bytes .../bin/Debug/netcoreapp5/Win.Utils.dll | Bin 10752 -> 10752 bytes .../bin/Debug/netcoreapp5/Win.Utils.pdb | Bin 21840 -> 21764 bytes .../bin/Release/Win.Utils.2.0.0.nupkg | Bin 6251 -> 6275 bytes .../bin/Release/netcoreapp5/Win.Utils.dll | Bin 10239 -> 10240 bytes .../bin/Release/netcoreapp5/Win.Utils.pdb | Bin 21192 -> 21260 bytes .../obj/Debug/Win.Utils.2.0.0.nuspec | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Debug/netcoreapp5/Win.Utils.assets.cache | Bin 11646 -> 11670 bytes .../Win.Utils.csproj.AssemblyReference.cache | Bin 177441 -> 177441 bytes .../Win.Utils.csproj.CoreCompileInputs.cache | 2 +- .../Win.Utils.csproj.FileListAbsolute.txt | 12 + .../obj/Debug/netcoreapp5/Win.Utils.dll | Bin 10752 -> 10752 bytes .../obj/Debug/netcoreapp5/Win.Utils.pdb | Bin 21840 -> 21764 bytes .../obj/Debug/netcoreapp5/ref/Win.Utils.dll | Bin 7167 -> 7168 bytes .../Debug/netcoreapp5/refint/Win.Utils.dll | Bin 7167 -> 7168 bytes .../obj/Release/Win.Utils.2.0.0.nuspec | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 9 +- .../netcoreapp5/Win.Utils.assets.cache | Bin 9907 -> 11670 bytes .../Win.Utils.csproj.AssemblyReference.cache | Bin 11 -> 177441 bytes .../Win.Utils.csproj.CoreCompileInputs.cache | 2 +- .../Win.Utils.csproj.FileListAbsolute.txt | 12 + .../obj/Release/netcoreapp5/Win.Utils.dll | Bin 10239 -> 10240 bytes .../obj/Release/netcoreapp5/Win.Utils.pdb | Bin 21192 -> 21260 bytes .../obj/Release/netcoreapp5/ref/Win.Utils.dll | Bin 7167 -> 7168 bytes .../obj/Win.Utils.csproj.nuget.dgspec.json | 21 +- .../obj/Win.Utils.csproj.nuget.g.props | 8 +- .../Shared/Win.Utils/obj/project.assets.json | 21 +- .../Shared/Win.Utils/obj/project.nuget.cache | 38 +- code/src/SmartFactorySuite.sln | 11 +- 283 files changed, 737 insertions(+), 34919 deletions(-) delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs 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 c45da225..c780d30f 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,16 +19,7 @@ "Default": "Warning" } }, - //"Settings": { - // "Abp.Localization.DefaultLanguage": "zh-Hans", - // "Abp.Identity.Password.RequireNonAlphanumeric": "false", //去掉非字母限制 - // "Abp.Identity.Password.RequireUppercase": "false", //去掉大写限制 - // "Abp.Identity.Password.RequireLowercase": "false", //去掉小写 - // "Abp.Identity.Password.RequiredLength": "1", - // "Abp.Identity.SignIn.RequireConfirmedEmail": "true", - // //设置用户锁定 - // "Abp.Identity.Lockout.AllowedForNewUsers": "true", - // "Abp.Identity.Lockout.MaxFailedAccessAttempts": "3" - //}, - "AllowedHosts": "*" + "AllowedHosts": "*", + "RePassword": "111111" + } 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 88fd5632..56d6ef56 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,6 +12,7 @@ ..\..\..\.. net5.0 True + false 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - - - - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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; } - /// - /// 绫诲瀷锛欳P7鎶ュ簾鍜岀储璧斾袱绉 - /// - 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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); - - - - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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); - - - - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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); - - - - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - - - - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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; } - - /// - /// 绫诲瀷锛欳P7鎶ュ簾鍜岀储璧斾袱绉 - /// - 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 @@ -锘縰sing 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; } - - /// - /// 绫诲瀷锛欳P7鎶ュ簾鍜岀储璧斾袱绉 - /// - 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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; } - - /// - /// 绫诲瀷锛欳P7鎶ュ簾鍜岀储璧斾袱绉 - /// - 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - - - - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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); - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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; - } - - /// - /// 缁熶竴瀵煎叆绾㈡棗骞冲彴鏁版嵁锛屽寘鎷琀銆丮銆丗骞冲彴 - /// - /// - /// - /// - /// - /// - /// - /// - [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); - - //鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - 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");//澶囧搧搴撴病鏈夌湅鏉垮彿锛岄渶瑕佺壒娈婃爣璇嗕竴涓婤J,宸茬粡鍜屽鎴风‘璁 - } - else - { - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version); - } - } - - await _repository.GetDbContext().BulkInsertAsync(entityList); - await _versionRepository.GetDbContext().BulkInsertAsync(_bomList); - - return ApplicationConsts.SuccessStr; - } - - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - } - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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; - } - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - } - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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; - } - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - } - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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; - } - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - } - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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; - } - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - } - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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; - } - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - } - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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; - } - - /// - /// 鎸塈D鑾峰彇鍞竴瀹炰綋 - /// - /// - /// 杩斿洖瀹炰綋鍏ㄩ儴灞炴 - /// - /// 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); - } - - /// - /// 鎸塈Ds鍒犻櫎瀹炰綋鍒楄〃 - /// - /// 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 @@ -锘縰sing 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) - { - //涓嶇敤浼爒ersion 鍗曞彿鑳戒繚璇佸敮涓 - 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));//杩囨护鎺夌墿鏂欏彿涓虹┖鐨勬暟鎹 - - //鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - 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 @@ -锘縰sing 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) - { - //涓嶇敤浼爒ersion 鍗曞彿鑳戒繚璇佸敮涓 - 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 @@ -锘縰sing 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) - { - //涓嶇敤浼爒ersion 鍗曞彿鑳戒繚璇佸敮涓 - 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 @@ -锘縰sing 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) - { - //涓嶇敤浼爒ersion 鍗曞彿鑳戒繚璇佸敮涓 - 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)); - } - } - - ////鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - //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 @@ -锘縰sing 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) - { - //涓嶇敤浼爒ersion 鍗曞彿鑳戒繚璇佸敮涓 - 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("瀵煎叆妯℃澘涓璖AP缂栫爜{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 @@ -锘縰sing 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 @@ -锘縰sing 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)); - } - } - - ////鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - //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 @@ -锘縰sing 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); - ////鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - //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 @@ -锘縰sing 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)); - } - } - - //鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - //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 @@ -锘縰sing 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)); - } - } - - //鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - 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 @@ -锘縰sing 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("瀵煎叆妯℃澘鏁版嵁涓嶈兘涓虹┖锛"); - } - //鐗╂枡鍙蜂笉鑳戒负绌,鐩存帴杩囨护鎺,妯℃澘鐨勪腑鐪嬩笉鍒版湁绌鸿鐨勬儏鍐碉紝浣嗘槸閫氳繃涓狪E杩欎釜鎻掍欢鍙戠幇鏈夌┖琛屾暟鎹鍏 - 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("瀵煎叆妯℃澘涓璖AP缂栫爜{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("瀵煎叆妯℃澘涓璖AP缂栫爜{0}鐨勬槸鍚﹀浠惰濉啓鏄垨鍚︼紝褰卞搷鍑哄簱璇锋鏌ワ紒", itm.SapMaterialCode), string.Empty)); - } - } - //鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - 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 @@ -锘縰sing 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) - { - //涓嶇敤浼爒ersion 鍗曞彿鑳戒繚璇佸敮涓 - 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 @@ -锘縰sing 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) - { - //涓嶇敤浼爒ersion 鍗曞彿鑳戒繚璇佸敮涓 - 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 @@ -锘縰sing 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)); - } - - //鍜岀墿鏂欎富鏁版嵁涓璖AP鐗╂枡鍙锋楠屾槸鍚﹀瓨鍦 - 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 @@ -锘縰sing 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 @@ -锘縰sing 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}瀹為檯鍑哄簱鏁伴噺涓嶇瓑浜庣粨绠楁暟閲忎笉鑳藉悓姝ap", 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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; } - /// - /// 绫诲瀷锛欳P7鎶ュ簾鍜岀储璧斾袱绉 - /// - [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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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; } } - /// - /// 涓绘暟鎹瓺apper琛 - /// - 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 @@ -锘縰sing 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 c9d08db5e563c6331dcd106268298e27a2fcdffb..a5c3a589b2710907d9701992ff0b561eccaf25ea 100644 GIT binary patch delta 239 zcmZp0Xt0^kq12LnXgvcIJYY~#;AS*nU=RZeut5YLnND04#@IiZk+GiZg(y%=0f@yW zcQI-+N=)9ysLm)e`5vPZZ3>lM;iYZHPthTUKS?un%ext*ku1N+MJC!229cU5^Tr{10QCy1g@Z>k*VVn7+elasWG2JXE K_nvX00XqOzYfG{K delta 299 zcmZp$X>gd(p%iQP>jDE5JYY~#;AS*nV2}U`ut5aH%qFf1V>~>Wk+GgjMhqyX0K^iL zyBM_@r6zA`L<5JjW6Wj*G-2?_@$ORc?GAIl;os3CMV~Y=9Nrl7SAz) zni&N%6KH?Pm2NeA$y@HzqY4i`d=0c623XC2EQN`RVvOG>?+_2$tRQoSaWkL9FJ>kQ Ov(17s?-?f=umb=T)@lL( 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 0567182885e10cac81cb046eb8f3a68134dd646c..512da4b1aed8512941e9ca98708112fea9a11c73 100644 GIT binary patch delta 751 zcmZ9~Yeh*@xf%|KXhHa6UXuw!z&^`(&kR zfS9zs6(s=Bb;z_vekpVPwXW1L=kd&p*7mzo%}w^YN+3`N6z*X^!}cWv!U%;t?48*6 zu}84ODS<>v@g=}p=M)rNs10?Z8|aZ@;qXr|FsfkS9r}o7&>Z@K#7YJvC>VuHF%F|v z)PruT7zk1`umKgjuaL(iw_3^Kn_kEp#Q_7kG!Dd|WXvFfEwmnU6YT>Q`V|uk*+*Hp zshq$(uL2PZKUFeJvpN;CUm-jYwTKyWPI`vW%9N`l#f0&RjE+^Nre|%Hotzd13`O5O z@_}vLZSzqv&wH)Q@^8J(m5fIyj4yXQ5!Q;MwM+gPvAbl)*qYij(W?U|D)I)0!~?bu zxi<=HRJI19dpWeeltQ1zmzSy`>kyJ6CY?@mwP{G6NR(#~DJQ`J>|U(7Ru zZ&n9z5@AdnwrGY=k$K{igI@39y60)+?DhGTy+!4hC$*A&5%C`4h$lxkQb!SWyr=bc+Atzm^;!PG rgd+zD?@#!%#K8$YdSld5Y7QZRxCX@DS`*LZW?~k zQeM>MHBF_kdBH4FEUjP_CPZOD7gS8MH0(l_QuJg&WCwo#|A)hQI0w$)!O}ye$Ap)p z2>C}D&02)e>?>b&UF?zg)|QFkm{H6Aq0po!Wu^IfEeNA)h@fxK?wFuxj8P(VF?0Y>2ByF)m;)Z-#mzrKA%U1e>p>6*0bw8l!~r$f15)@9E-(oe zz;_9Sc1tN#4C=aC@k6|$N6dklZh#8{5rxV~AYvmk6^&Tv94UY-A^nJhxZ;t;>?a)b zRXhUuQi50<6e$%#o{>gCa>dL&R#TYARQat5NApy}jmhdZ-s|GZ@t!M?6P^&V1ZtVKS)0vK1+qS}EGJb8oW7l6^A2NZ8r+@x;yf@(XIe z)PeAU?b>ix?1z$eciyQr_0K$cjcyE=?U%RY)Keklx~zL3NQe{N%{j{#{Ae28WtbgI zt*Gg1Rz+#=^ak>_CYsFFG^6IIVXHpQU@~NCEaps!F6-Y(Hj!|Cj-T~e$P~--K20~B z=c={1d%Phlx2j=GFs^r8?ev8~Of%bi$<1vR;r*&1YgoeOcb>gN3EBH@zgM_s(kDbw z&f1IKo@L5bHuHuZBlr6IUR$4Sz~-_&7GAH;FwrGNj{3Od!s*ii-mM+0$J=8oFlS>> z_aoNZ2<8CCf7O2n?FxqB1mG7;4@aO3l?00wk`P)JqLRquL5fhBo(|Egf@Mlwnog$( zPSa`i3MH+g6~VGJO_+w(8?-WcXxDPLVbQX5?6hEKK6ci2&B%C|zn0|BQg$xO&c${W uF3KTxBe5@#0tYGl!mOjWczWYVoQrKf*w%>c+ZZdYVEK?3ri13gul@<1lnFur diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll index 16a996079cc0f9179c2b3628746c5538495e4c2d..66ccd59381f12250b936938f4924c4b1de1a2362 100644 GIT binary patch delta 268 zcmexw-C#4JOpKRHg#iKrTp1XA7?~NidK^1Ev0H|5*Tfa!jH#0t>lqJBZUB-qH!&3p z3LL$0&3f{dT>t&0_sUI^E_7{f7JkBLxc&#ndj>||04AVOZ9u%k7>Gro1_LQZAQlE< zbs)Ag0piIsM3qfEcx*(ZoGM*6?lsyx|L@zMAXP3_G0y%jt}#xjnO>QB!Ko!BIjN4x z$@!&uB{9kQDXEihh=v+LHHyMCf~?=js%ps?5;nE-#Y5R%pcOE%9K=?bs3^ubb8?xO b_T~j*p^Te(C4Mn8?J?ObDD#eSq5%g0ls%}ZUmA|n;Dsk z1qJ5p<&t9!Z}*&W2?K-r|BDjpt(ssNf+y8ofx$EP)ENz#y<$P$rFWGoQpSW~L=3K+b!{i3aQd Dl7~za diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb index 7c786df95f2e67a4cc1dea26858f2c225062dd1a..563d669faef65f08c4fd67d5285b9b46a300ca06 100644 GIT binary patch delta 811 zcmX?-(vdpBBxVZ}1A}rM1H%+%1_lELAUn9EC^Ij;7|3Ke0u*BbiG>C;oB*-|Ky3F= zPZuC90hB1v1M;16@{@pk4;~v4DW^);jeCtY&;R@O=lUNU?EsR!vVVqj#bXJBGD z1f(wjX)Z=a1_?$chCm=452TL+=^H>=hKZ3umkH<~AYfvcrNhLq5QtX*@p>TM2E==H zz>-jch2e+}3&Uw3z68WKf%pLsKL_G>K>QVm|0n8CV(gSezM{83LG^futYP@3RO>SmU zs^>-0(y&0GgRQdGiTQd-cYffRi>#+Jo@Y)d+WbZ(e4?c1<>_7FUnD$(^YY8nauTys zJyYCM^HPfvOY)2Kl8aHy`KVBv!O`-RvvIqNmK}GOuZqmN1g;kq#oX_mKb*N|BVflP z4mHLepE-?|3cobWg>GfpZU4(8`*F)(tG&^gtDYK85xcmAMd0L`CXL9+v8?V!0x&-` zHZ-<0_B75==sIF+k!W}|xv|1F_}rH-dk>u2&RTN+@%pH~P1{n8Y|<7cdS-eCy2g4&#zv-=dKTKr#>vTsDF(@@sfkI3iDsrLi3Uc7 z=BXwI#ulcAiH4~biN*#77G{Z)YuV~qEDg=fHnHE-Vd{HL^Cilq%klt ztOU|qf%JPI{ToP|FfuYYFfuW$0Mgrm^lu=|#RSs90F*7!VPdET;wB*O1mX!mJY5GY z2_;w<=IO97ECu2z?_ET_l9U;)Gq zn^!X)WR%jh{HMCLKxcO7rzF$)p_$ehEv_9ycWPRN2WAA!SiCU@oH~1tLu}|K?qEycf z*U-?ez;b+L@+nzgcda9peKNBDmOKnf{ct8>+MK;hEu4}L?^c)a49?3hPs>TnPW4Q2 zPt8j$N-W7Q(n~HzGUb}WukSL&Ulb_ zhD?rS<Ia!cRnIBct zjmfTTicF2SC+Dz9TN>*b8tNJ7n&=rBniv@CnQ14c8m6VC8Jn1-n3!3bo0%Dzq?%a( z1n diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig index 795cd352..a8549a82 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig +++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = -build_property.ProjectDir = D:\闀挎槬椤圭洰\鍖椾含鍖楁苯缁撶畻椤圭洰\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\ +build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\ 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 8fe10ea0cfcc91c43238d505b88083bd230a51eb..ba2c3186e9a275e8388f0a3d86b8c3c9dcac5ef0 100644 GIT binary patch delta 2281 zcmZuyYfM{Z80OkC3M-xCQq5R9ZsS@g<B_#!09}JxH)qM8l!}(>`PhU@d9{%gd_xFEm7*1UK`;)!F zFEnTOMbfWo|2pfm2t(0eBq}(1dWT0aW)apttjH9BCbJRo5-V(}Rg5tqx73g8DizYx zj&p3Xv=<+z@w!#(S&XO4wM@93euc|0*hbNQI17Jf$aOxF;%oL-(WRidi;8O!zo;;y zU-=TNQjR_4YaH5fj-&7p&C_I-W4YRg%|miuQ^_&w zE(bbu_{!@pC9dXNxK}_hxs}a^-g@pn1ot~V)dw$l~B`vmQWX?D(^|g z7vR0T^AgI_#HG82q9W*ysNiX=#g7_#ipcVs2W~y4O-;ypjB4(fIuK)sWV}0|!l|a? z*gn8+YMr=nlx7j#T~8sb&DGdFz_#Uwq@MKN6R2sa!EQdy(tAtLT|l3%-mAsytqN4M zR^nlStRbuwmkKGhLUFGVd zc^2yC4}^kIf%w3+Zvamu9Et=k=(=a-f>B+Wv304nxy)!5`e!C1;b?d| zrt{B48msC#1GSUyU2<|4jjXw7~ZD<^4eQ4vE?rHqK5M)3n$n~cfR^g-E3hTyP0Z4PxVW2(N7Ni(jv#H zr+S%&Fk`GD@shyMFupR=+y#F(>Mhh`W0tFuithgTwob-~yWiH%Gi2{)Sb1jE`WBaQ zJADSXI&2(cu)V|33i|Cdwr2lE;ujUq;GTo>;?AGIjZVslGaAARPM+Cu(ys)Glf9qQ zCHE!neOtQ%!3NUo{J-jKBSHWvH=wIp5emu~zM{3Gi>LiD+P delta 2337 zcmZuyZA@Eb6o#>mk9LJ_&;l`o!6@IQKu3WIcp!UjlItqR`|5|+7{aU9`@%_W^eyO_M zJX!RYUlPf`66ycdmU^*wG%zwMIvh35YTU`|pTAO~^?(cxfA# zj3GIS*nQ|uB`#vm#g){c!tKGol~oYah&Oc{!Gkob!kf{SRRhsPyx_^lvdJ&=f+vXK zU8EK~*%)y6khGiBm6@6F?CzA+EV}32jxV<$I#i_7j=08x+vz?{)@)Y>ycyjZWYw2~ zTN%AEh#uFS0^TxfS6?&tYcy--L@d`jan7P@vT)Nfq-f5`Uz>q_Sn?MvWZ7gOVrN%z zSP`Q;s}Xb2jGW6|Id|st;X8c-3-N8*#j>T%?1uylNCHX11Wb=W1f5%rB*wjX}9*it#iC<-RGyX{WZrs*ic+sC+cG{F>R0 zW3^fh_fDUpVZJ$lm+DkaAAV9I?w>rg)|1nuw;${E&2)Y8WO3G)Yu=OaNt?ID%tW8s@aq%n28 zM+c0)gEjc4gE+x+P3HIj$ico&dSTQ~PQ=Y_6MjrLBGO5joMjy?;DVP{=jeI4CW~gf zW;D?=-EW3Br|_k@OLh}bi~1JIn9;-^t6HTBAp Ozaf>Uu51R3$^QW_U%U1I 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 507cad31c384c32cebb59002f0997b74a95ed6b2..a5d377865ee6beaac0f9144056b7e3fd02c1086f 100644 GIT binary patch delta 6996 zcmZu#d017|7I#0U%e|L-0TBT~KUD_hE!A(a3TjpL=zPfF|{0+mbfLe ztTfFTc6l5!p;z|EFNeM?QcD~3f8q`PNNh=TY4{OwfK=rr*gfKA4IqmINuyzpAYpei*#sz80=yNzo1Bn zbGN}s7b~fC9cQ%mG(GLKx9<+6kfTZYnNRRIFP8+zktqqrcnT8KQg)*5nPJbwhepCSs zZvb@pChDCg^LuXBTUj6^pgSb^H|u~F5)x4RcfhV**Y!ZzysMW7@e6vzXwVfL0Oz73 z;X;@*-0f?IieM{bhPb#RT3X#g>zdfM2MXFGJvHeHKJX}|4L%K>WMPzbo;rj(=ol!ba{;RMJjGeJP13|LzsV zLVNN;<*6+_iBzXVas#GJNcV-asqWyFI#UH@le4KK^dM!ANn3iAsHo1UR;`lA`0??Y zG9E5x&Q+A5AI6i7Suvv0Er+kilr1@fHDw}PpKOLdC)nY!Vmp|o_|X4mSTtdz#s=f_ zt>n)MaYmy-lilH^N%QnTpi)wpJ5&!|WdH?EF_TkMhUr0OSdnLe>^$DH)K|7Nlaiom z!;Rp*)AKb}GCp5m%Z7u6o^ZQB^sR1=og6Go)L63NuUU4;omr-_00qg?V}sfuYynT|=HzLF9~+2n%{7z2xg#||HXNAuoB?!To;NP9M=g-JV6C<1BAEGAKfJci7*z>hTg(_(xY$)YVjP!+4 zD;d4Gk4U<|Y^va1#*%HyQ*=WD6fARw$Cu90^yHhRYRVmeDoqLD<-C2karE+BL4R?% zNN%aLzz-|j;mitg%Qn|onUri^sg@HXvs6AS5K$1hRH^gCQfY;PRiZbHDSuTDGOkK3 zBL|ZOEY)`SZZ*GLu*5Jhm6D^?Pw?b$uxYIovYr>3iGhh}?I;nrah+jllD}SU9?o=p zLr*ZjxLg;A2b|d8OMZA!ZEOx+yK%lAND?<0QeuIUS_^!+S!f=zxh6yOizPX-j^Ak< zk$RG!>xA6#J!8rRjV7>dF+<>72_C{q#ewLCG-%% zz>;=n*ZVrX*zU~U^rjWQdh<0M#tN7Ah>g5z?*Ubx1?l^2Q2SPqBB5(E9JZ14eQH6~ z@8@TsqC0$GEKgSb{w%N^w!+Zmc9?NUh^6Ils)*TnglE9P0XvU4lc~+&8YT(OwFq5D zHjxBT+3TGZnuFx4cTz;rSz`o>uf zx@HQvzvl_t!o%c^ef38Z)SWI>v~8zSAfr{AD=EaKO>G{g^!UIX>fYCyI)%jjTOAV& z@WBVl*_N?0OTv3GUghe#?12WH8t$$Z}`QTDF%M4W;6O$Dn#CJg_iGlr8RfT5;FID_0(h_ zznh-Wdea3*n2{aaZz|gg6itrYOy=oj$Ui#GklCqBD$?A!Qd9B{XKOsX?FK=&-ALwt z)sl+7l?_*Ki;hqb+0vy>NtPYkok>~(U`FmyD7wo>ch>m?2)wsM)hB@MenPBcue3~|QG9bUDvuV5cz9+cc7iaa}`+TD@@8e*GX#$)SL&cqpz56%XA> z++PD8!8QJX%#9x*rHN%eCX#9p;(6Cd@t01>1D{!g?0AS1dfJgk*+!xoex?if!LGC# zf=9XFl`g12gj2=nM|{DpZm7b6l4!CTjQ}wq>9QI1*8$S4NZDEDQKDq_K>UPsctimf z{IU%x2d<356lG>YZ>iFbc(bT@ciieljci_`_leRmFCBFn{>umT#M8Q~4y+DB4xu!{ zM;E9p^}-!Jc%Ya=WuX=3xH-UL_Bg@TJI`pl@fwkl^w}yE^g?0eNr6NI6+qgcP&wXjDI1dR6~aH-beaQ6ayQI8c#M$cE2^BjvToLCA%6=yy!Zt}m`0pvEP8 zBjW-GA$LcK&m4%94%cWTsurs%4a-KyBK~GYDwIdKx}U4XEKxh7lfLrqM|x5R&POBV z2J46`|8eAv_YFa_#oedE7LoG(HK;pY5`$74La8kVmGa%Zn1&MZsS$L~Mh~akQ!@++ z?|9fAOIw~Q)CS;ia8R)u7z6oAhejfP!NDBlgC{515=CYk7xuxY|HVsGrDHM= zC~s`RlSU)ueNdo{jpI4eET~M)YHv)R=so)KB>PJJ=TZmB!LewkApl&LfIOv>@hHjY zpc}4Aq?wRLNc=A{mFcQYBo#(WsMTP<4TkMQ8Ma*lg6oy zq7nQ$4)JqFNwT}NI~Da4+|zDj@z^IF^^k6+qk)1x6&GZP4oKeP5kEQTN8)&#H-UCV zNf!Ot9YAMyTP9M@XS_NGWl2<{US(9cOAcD5)DZ=NvK*&V?jy22ENMK--iz_IiHLuq zQD{8yg-OT-@0rAN$_z4Pq4Z3ynopVa+sPs*McO(AsW%KpXURir91by(6zNJH50bq0lhQh=1Zl#IkoC^ZzSeIPqV;hwnn zOr%`?7&3=Fdq}^|M30M!k&zM1kIl1@k|K%1u>qufk8m*EEuu^xKl3+Cp7W72o;;6t zstlK?kPk-godstU(>1p*P=_O3Gee?6euQhtg^Os7Ut1`Koq@T~MS80Q3E$P?aY!jr zzRIxGGw{Gt~e^cS0R2o zWaNLWQqLj^Ns#tb>5DM1nvY<))7z`n0mH1D*YF~dU0e9PzOQ~>%Uen|rjNe(>^k(a z5ZvMQyl!Mj$9h^DWiRM`pcoh2^&%498m0Xk)PW{%iHv!26Ym3=jAG2vkDK({A_I$R z)W&5g4XRboIE`#?9TGl2V2W|W`|6NgqTkrm*BF+B+YLO+@~X9fwh93jZ$UZABO7<7 uMpUC}WAPV_XqNKWmL4lrY!$097T?Bbx~9e(x1lD%cy^P{*!&U-L;nYAwU@yF delta 6999 zcmZu#d017|7I!}x@4Z|G5dkkUNKYIPP#oi>$tVyqq@bdJ6HbVPCMqOiW{Co_#4TxM zXd`>vZf118ri|qg4eqm3j{Kr)DU8uJ$ zYIi{hg+Pfz2$;K$R1mGHJ)y5Y6L+%ex_r}ruwY;attL;Jx%M+^7{M8IfQ zE1Yn&kXom)Mr#k3=N)EuskK4iAREPb!)6z~Pd{RIU1zj9XPW9TGwxj*M45{B=y->C+E8Oem0FmAXYx1u5D@Mz?JuFb!#Os45^LlL2TbUuqzZ=B)HR*t6669a|cfih`*Y!ZzytAhp@eO#>XwVtx4`-ty z;C!e9-0N+E@<0ou2RXVTT3cOi%&%tqZWFW#dTP=cxc^B?D_jiDc1Rex#|Ggc^Ys?c z8E7RJL+XuIwV_iS)}CI(QaamUQ5)(-8lI{$TEv8T)6jikL7yQGgSLETud)2T-Y{;E zek05zCalq5UElAZ-b;Ny3%S{E!4ohGREN7!KUP>D?FXmAd%@KK`Z6;!)9Ubz22)6m z*rj(tY>}l#(DA5qdJr6s@`m&$6y6;C+0uOKPJEYubrwq2;O-{Qgw$^ zc`t|@yntL6bkCTvsGmlBBb?|xwn zv?VT3o?25ANL5knG4^sA+w5C>yimJ3K)hdCE8yBl7 zW8q5r97P%YNi3<(h!&O3S==8}HfIggl<{zVq6z*Q?+#BDxr56jZ~ET^3&)Sp*kD|q zh5R*sw9#n5L|1q{d#)Y`R7whRhUmd73?SPi6FE6)s2*g3Ww~a^%;jB6V`Z+Hlmtu} zW(4n^ny0anad`q;CLAd6fIInOY<08T$$^4+jU^Kv&v1vF>7^PAP>?J=TF@6C-h^tP zW5yaqeZMfXo@y`66!4^OR<1_)nSto`922q48KD6(VgKBh450mUy>QtE)C}?SS8JXi zxM-RlNUjuxYfSO5tk?{>#UiMz*bR<#?F*3;YQU}81=#bog#{{UJghC@Pb{^smRQKB z7eYkReWjBHuW5@mD^F4Nage{n0R}IgrRm9y#cIm!fJ#jXVP(91xN+3d96^6!sYq_F zFvE|_T;cRGam&`%SeTToU#^xDBQsaLC=gK)xm2Nx#9U#4{1sv}j45wLcQUq8Eh9UV z8O&Ag@cl}DzhH@BU@9d?s-EV_;b5257RY#6XeI_GE~`h1!0J~Fu1Ve+wRt$xv9&$G z^x9J0Lfqi^S|9S`YieV2@apP$dLW5kXGn<|ifhgA)q0_M$oiTzF)o(mh&q0&v9HvF z{8A_6j_(;$&Tnu5>qZmU=1A}emMZ~7)u%w)Mxji|{04QLuz0`U^nw;Ec>_PgL%3fU z3+;`b5Z#z70NNXc;TH?Nwpn4;mc<$Xa<w4UFQ7 zbGBH)uYZ`@Bsp8$;NaT@3eARn3Gi@-1;XDo!s?UJby;i8*Q>aL&kNQJalDbzds15u0 zS*Yj^?H|LFwP9ZdSPxlX$WnKhc2HPL^PyxBv+Xd?fSm)j9d;m-o5D0q0-S9Yx{j

z zByj!E12%_+${YLEPcBe*szlMYo=k$Y7HzI15yw`wd6?4eV^^sANNegOGWy@@m|%d9 zKUO9e3I0UA^K3ZH?-Mj7rUGj56j6FR*>VrwI#;O32MG z)EU4)g2oApu^${?=(izc7U^#}WT`5T!2UJAL|KJ-WV84CX9fBSzb!O-M_F;;WLjhO*Nc0Qkk6g*< z$NiqbHT;N74WA;ViDf<}l4=m*dDlqsS6z`CKD`RL<3U}~^Y%Q-HWJnFGhM(BbfVP| zIMNX>cSQLjoGL~=5esf{M&)*tM3dEE1c(cgu9#3?9U#?$l$~V}#Y-kP#7{_jL=<4g zTdhbraAg#xC=(NUNfqvhH;amQ#VwxH$m%IZA1@vC)KRD4$KI$1p3+SXU}XTZ3#H-S zx`oP8Pu$*}FBEgAEVRI^oMv1+61m{15%h=hdg6^e5MMbhtq+tm%68xS(de&cAqk)L zQ`bd7DY(%e@fwkl^w}ci_e5d^q~M?c6oMbxkaDe(C{z-XDg!+5=0K5aG7fzf9l;Tq zG(O(|y6)k@s6YuycD=ke4eIA$q@1j5g=zSu-pE;cF9h+)!cv@q^FxsnjtND|5n)dT z6G{(45pQcdG_nsZy~=;88^Km3Q6ayQ*ijLY$cj&gA?3BmPRNDs(C4U@T_0T4PhFQB zjf}GmK(6)@pWYuS9j?(xR4rCj3YLwIhX0L6DwIdKx}Ph>EKxgSkUsM6M|jWx&P5^R z25Vne-eBZ~_YOic#oedEW|8uvRj3gz$>DU*Mh&CeQ!^9^ z?|9ffhPFIas13m3{GFYi#0=yk9UOu91qXAGH=gh`;s+{4N)(xCbnJ~!{fn02_8)67qf=Y`8{TxEr1OVEm!uiP1*Pec~HFOd&W&4wwUv_ZmmooLcOO+?*s z!dSIYG=ks8B7V*&S#gziB%?k;c-n0&7JH|n?$WJP)L+mi zaW3yv87@&FAB;RYGfpd_KDW$Qha>fwCQ%_j!ZqZAg|x=6EfANThPlvD+Ea{#?`p9) zs01lrWtjIg+`k05N_R`tV}ui%@Vru_+{zj9Imv$!Qm@=B>1!9O6OC?P99~~W52TzI zk@`NMfZXs8OVo96h67?bqVI{miD zz``1}aal?OYSlANBimhvgwGF{Vw~~bI^-_VZ*1yo3`@eDdY)z3Yb~Hn!UBsnqAcZ+ xjXReHRHJHR@Z|Z3>lM;iYZHPthTUKS?un%ext*ku1N+MJC!229cU5^Tr{10QCy1g@Z>k*VVn7+elasWG2JXE K_nvX00XqOzYfG{K delta 299 zcmZp$X>gd(p%iQP>jDE5JYY~#;AS*nV2}U`ut5aH%qFf1V>~>Wk+GgjMhqyX0K^iL zyBM_@r6zA`L<5JjW6Wj*G-2?_@$ORc?GAIl;os3CMV~Y=9Nrl7SAz) zni&N%6KH?Pm2NeA$y@HzqY4i`d=0c623XC2EQN`RVvOG>?+_2$tRQoSaWkL9FJ>kQ Ov(17s?-?f=umb=T)@lL( 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 0567182885e10cac81cb046eb8f3a68134dd646c..512da4b1aed8512941e9ca98708112fea9a11c73 100644 GIT binary patch delta 751 zcmZ9~Yeh*@xf%|KXhHa6UXuw!z&^`(&kR zfS9zs6(s=Bb;z_vekpVPwXW1L=kd&p*7mzo%}w^YN+3`N6z*X^!}cWv!U%;t?48*6 zu}84ODS<>v@g=}p=M)rNs10?Z8|aZ@;qXr|FsfkS9r}o7&>Z@K#7YJvC>VuHF%F|v z)PruT7zk1`umKgjuaL(iw_3^Kn_kEp#Q_7kG!Dd|WXvFfEwmnU6YT>Q`V|uk*+*Hp zshq$(uL2PZKUFeJvpN;CUm-jYwTKyWPI`vW%9N`l#f0&RjE+^Nre|%Hotzd13`O5O z@_}vLZSzqv&wH)Q@^8J(m5fIyj4yXQ5!Q;MwM+gPvAbl)*qYij(W?U|D)I)0!~?bu zxi<=HRJI19dpWeeltQ1zmzSy`>kyJ6CY?@mwP{G6NR(#~DJQ`J>|U(7Ru zZ&n9z5@AdnwrGY=k$K{igI@39y60)+?DhGTy+!4hC$*A&5%C`4h$lxkQb!SWyr=bc+Atzm^;!PG rgd+zD?@#!%#K8$YdSld5Y7QZRxCX@DS`*LZW?~k zQeM>MHBF_kdBH4FEUjP_CPZOD7gS8MH0(l_QuJg&WCwo#|A)hQI0w$)!O}ye$Ap)p z2>C}D&02)e>?>b&UF?zg)|QFkm{H6Aq0po!Wu^IfEeNA)h@fxK?wFuxj8P(VF?0Y>2ByF)m;)Z-#mzrKA%U1e>p>6*0bw8l!~r$f15)@9E-(oe zz;_9Sc1tN#4C=aC@k6|$N6dklZh#8{5rxV~AYvmk6^&Tv94UY-A^nJhxZ;t;>?a)b zRXhUuQi50<6e$%#o{>gCa>dL&R#TYARQat5NApy}jmhdZ-s|GZ@t!M?6P^&V1ZtVKS)0vK1+qS}EGJb8oW7l6^A2NZ8r+@x;yf@(XIe z)PeAU?b>ix?1z$eciyQr_0K$cjcyE=?U%RY)Keklx~zL3NQe{N%{j{#{Ae28WtbgI zt*Gg1Rz+#=^ak>_CYsFFG^6IIVXHpQU@~NCEaps!F6-Y(Hj!|Cj-T~e$P~--K20~B z=c={1d%Phlx2j=GFs^r8?ev8~Of%bi$<1vR;r*&1YgoeOcb>gN3EBH@zgM_s(kDbw z&f1IKo@L5bHuHuZBlr6IUR$4Sz~-_&7GAH;FwrGNj{3Od!s*ii-mM+0$J=8oFlS>> z_aoNZ2<8CCf7O2n?FxqB1mG7;4@aO3l?00wk`P)JqLRquL5fhBo(|Egf@Mlwnog$( zPSa`i3MH+g6~VGJO_+w(8?-WcXxDPLVbQX5?6hEKK6ci2&B%C|zn0|BQg$xO&c${W uF3KTxBe5@#0tYGl!mOjWczWYVoQrKf*w%>c+ZZdYVEK?3ri13gul@<1lnFur 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 942af20cbd6b34fe3130ce9c360135ea7f80ccce..0c32d7d3380799fe788d42740ee3d75ade9ef221 100644 GIT binary patch delta 10 Rcmeyb-Jmm}Y-4GcC;%I=1fl={ delta 10 RcmZqB`L8{pY-4$+C;%F{1fu`| 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 942af20cbd6b34fe3130ce9c360135ea7f80ccce..0c32d7d3380799fe788d42740ee3d75ade9ef221 100644 GIT binary patch delta 10 Rcmeyb-Jmm}Y-4GcC;%I=1fl={ delta 10 RcmZqB`L8{pY-4$+C;%F{1fu`| 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 bcabfb21..a8549a82 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 @@ -3,8 +3,9 @@ build_property.TargetFramework = netcoreapp5 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = build_property.ProjectTypeGuids = -build_property.PublishSingleFile = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = -build_property.ProjectDir = C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\ +build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache index cf64310d63469fc887588b9d7c492d4d9c70891d..e83841c2d425d0b925f01aefe68afe0debd44cb3 100644 GIT binary patch literal 28412 zcmdU2TX!5s5q7}Fc0!!^l8YTDmhU#U$C7+^E?AaiTefT~mf~F45LUY*dFmox+s#6~Sh`W1w!Ol2yE)k?IyKKK z)@p9E*mT^QSLpBU@3s1@-a^HhEY$3#*DTh`#YVZGiq6~3(?N}axQ11(R6Z-%-a)^g zp^NXA)3t)G*Y8NdQFTfU*K?|z0xku^9y>$Ok2Rbt4RP6W-ZL14ss3~}1VFg*MfL}-VZ+8Iv zb0(>*wzn4q;GVuDfInOB-D{X-u z6OG_>c~}Ab2;JvfF&MBn=QZu>bj6*dZ{u_hu;YFMXGH@Dbc+JChwk%z#ILztlh9?F z42H$+oM^%{4Yn#^x6%F0Jc?Y!r9pRI(&%x<^VVP(i|${_Bg}fksX9$(M%7_U zZo@9t>xWF={IRGWO7@@vtC#NW6j(K<=~_i^u2!;VS&&VVpLw0W#MA>!Jv?iXpqLsF z^eG7X>E2x!0=H3iYMS*8KgbG;jn&tiw73f{$Pj=!cjdQ5+K}j?*u1(NECzd=?aC$E&+uu)88# zh2C7?^B;;Sk@HEx`BB07G5SrDexNPTEQ};jIBfAd(6Fb_c+zJbDg=rF&B2Hkxj!zr zKOwk(k$%%Y7D?`wQ?0g|ECd>ZV^*JT3^X`K!di&vlt45f5S^yq*HT6zLR780HQMl2 z-LhSg%u9y}Rzf`egfxOBs$TS~8thDi0^5+lHcY>lvte^w(-0jAF^pVBIh+x^!jU;k z_v6`kk*VTE6St!wH?l*#i2Tke{6^@$lAWJbo~sqfq(+mn!Ly*xIugzTu||WmecnT& z!XQ;ZAm;^;3-rsc;wW7=768Patv77XH|J#&!f;#xaaQ3P}-ho=;-SLr_EJZOm4DsGYOodyBK;~>aKeR9OWCU!Q& zhI8>5`gfYbA{Iqo^B{AHOWMM;2}1Olm|#6+SWqK^XB7m`(S6!yIz(`dbTsB}1&V?} z3^9g?KA|jpNkLJd`=?W8z>HfV#ci@4tW1YZ-{`AMHb7+Rdi1>D`DOa$_2>n<_>Y|p zT~rb3af~lJE?bC9T>x9-mrq@e~=>x?vG`KOXexm3sUQE4Jiv(>@Or@7T zQYFN)+0d|Wmf<$_ICXXrrq(wnYyeDfSj#WPNWc}hXe-8_ex`XSrnxjc;V;c&m11+s zZB#vezA^cHqSzpRv;TC1wDlC*aKD=JAl?}B({<8Q|0Bf3_xr`Tk@B~Z{ODf)5$y1| za9y;wh_+r_yg6BHMLQuT*cuU-_9RU8pr9IZiqkc=s+K%!$ewIX^TQ3|Ay3c949X8y ziw7gDSuVRv+_65+_hFj}{hS{@0K^vP%>3*=d=_c4{3H~@WS^^c1-%0&vcP})}{eUa;h<1VRj{NP^E z;6$ifabYO#sL+b$`rVQ`#Kat9v0f@Y=<8A(Yw;Dj_`6-Ci`Aq_x=M7F>9XmXqKoGx zD>PeD)HNbmc9v+!Wi;I=R(p7@^?G*pAD=ybbZ7sG*tOSl)$v-zO3!$+Ri@qb__bog zE*CDf&f3i}5o^M2vHf{# zNXIW3TScKE)VeGHj3Frbd#B}*Zc1fXFk$?XwB0^l)(B;O}uiay!h z4jlo&7&@}_LPh}S!|;OTTLDMWH$&b-wf+k2nc}05RgR-{Qv|Q`f)pid;oL| z`M6b~9smbJJ<>cTwe~|ifHQ`8ENW;6U^oP?TUtXSo@BXE6Oj4k^F(-!q4*S148 z0LdwVWPpBeX{ZKZ8Wfl~RHLII8o&cXG&&xd0emntWAXfd008}eix!Fj{4o?GqwBrG z;VrpCFn~9PV01O~0(fHRMaEaVlOY#?WL&&PyvTGZ)B?C+s71zcZZE_Fcw>k~nxY_< z({@5DfHQ_xqAUXGjHb$B>Gy`1XO9>f2{Ud$DZubl8iH-~5NRd5-8{7sfTZ z9J;R4b%U-7T~)enwe22YqwStyucAu_o89*L3^%fYv5g@6d2IX8A++sthwe0V$ffdp zn?<=powNNzC(!oKo#11qx>2c9c_*x@-S7=SchEP$-C1Mk4*QF5AKw9V5Pb*SK|ZFc z8!vXvE^XfebP9b7+^KbjPH|L3KFg#0CUwU503ATz19xD9p#$u^@5Ecw4c`QG2YnOV z9X{@=n`A92UkbhpfR4TkhR(-ebz&-V#k4BrQI2z?*i zAwD*%8?9L?UwXa~=m`2oxFe4kIxf?}m}? zF(7@F%Ja?eZuxeg6X@IFPH=dbZozzw$`{f10|?Rg!wC7C+Ge6^an=YN~zDwnc=YfL3Jx`1o z;03xE;3!=>fZwC?_B>Q6LW6@3d^|D~;6>t#0{p%K-#b*E(X*lTU?tE+rzZU~8`04V z#CBQ1_5%a9cd0yWAr`N&>!0TEkJ$_NwHX+k{6JJcR8YNVK=mUkPg{ruD)52XbZjIQ z86N&1dPMhQ1>H{!=-#LDH||I|(x8WDIhEjb zK1;J;+;9#DVSlK={<#76FR1*L1&g~$2Xo?RHWTLf9CmyjUOv);h<~Xd{>Xs%S5%(y zjo11z6E9W_Q#$^G*q&Cf{n~)-V=7NmBg7nNh8{&Tm6w#nQd^!`cyuK zL1h-A{zR?J3Jz!w=i>)0Fw?w8yf5YBt~)KxFcyAV{9HZ&XDCh`j(QPm{XuG3?0n?> zi3G#GEOU~pW*uEPt)6pqp#^4|`Mmov(K&ia^_|k3k!J?^&d84@M7aR2>Km%Z%j2xi z?U{LDFgL+HU&wj=(^>l~vkZ^>Gduk(W%_X`zh-il8bq6{%53z@oi0;Aa=A0S4!X+B zDm~3WZ`!1kvJFs^`V~~7!rAlqg4)NLj9;IAKqM>@M5zBI9f85Bqexl$}#NC?LOKV&2=#`5Z&ma5^1;3ZOhQ7St9dJ!L?XZdK;GlX)1 z^TP*C=FpAGgE);tIH~7pB_?Jpnw$@NH3F0v27&KX*^n7xg`be{fTy8olCK@TjA$h+Dn^bR5U3y;K3xVKWjC`QGN>Q66N zY8DIo?kh*MkiC{0i8a-7K5Zg zZCmo>2f%&^%0Nzpk(5EAZk%CFn=xZwf_wC`NSQSlxFLzg zfq9w;x6(nn4Q@nEw?Qugox9ngdF7@28(eYurDD}yDfXD_N4$}0z2cOdW@T>3o}&NL zM0v%TV#TvpaoUl}j9p$n(P-Jrc?;T~VnvxrrcGNt;CXhFO(H9Wsbck@Tc7j4{L7ov z@VX(JGlcs|X~$cW%x0r;H@hp_j`UClGW=?@R1RdQ6YmK7Gf*r0xkocpF>S*1%DnXP zwODPGzrcD$SgsXrg0gf-*~0ACcF3?DIgy!I9T@#!%KErkN3Ti9bx?=bOG>YZ>nDmy zm)@!Ex1{*eh!_vTA#ZR`3wEtvpk0ji3T1b%QViRq}}@qnD~FL(7Wy zC;VC(ia|Z##9ylF4DBkEyy|Zfeb+q7l0EEXV&tNazS^SdeA#W_tkPvjPNte}=jpQI zO4(%qp^$|y2=qyIa)d^zc*e!*Q>+8Zby)m6lKhiI$vGG|o^WS`b5K_Am{%g5nYup$ Tu}S`jNZpHcFludWLaq8goAlUX literal 22517 zcmdU1TbCSF6%I;-h}=R5go{irLlTqJTyq0~OlF2*V3G`(A*eLcJ<~Nk6}qcBUDZhj zMG!$m#2X3%UY5({(ifKx{sN!<1^VubPd@nKgKPQi>N-`sPVF;O-PIvU);cuj)IR%s zd!I|~bIw;Y|IEz9=QnNI^!GRacJS>F_RYMxcH=)@{P!OR|N6xLPCvMH|9{{Axb>gy zzyH@iFP(r;^zTdfZB0H>dd|07erclGa9qa^T9v?Sl`OYivx8Ezvix$TX8Wb{cCgf{ zIIeG1T-OUKf#bP;X>@pW*c!2hOLb?diPXG-$=C+sRBWWXh9J#U?geaqiTN*oyr7eKg{{ zZ(eprN;#IDr=fs*{VomgHst#`3)-~u+siGi+=X0DZ;*wK9uEI*4gPlI-z((rs@=4) z+PKSWj(gq?7tJ(q%mLZaQ*q5%Rg*)#M}vAV@_+6()FNxWgx|E{@6e375BXxRESjFp zmUq#?N{#{>W#Dk&DAyES+3LzfuE0*@L}|z z2KUu=ZdqecoWV+yCqo%=P=wAE@Cai`Z5HVDQpKhu%s zZaknNI*9zA3XRJMQhL|ba}1{-r}klT7kuG)Yg8^z>y5o+D|FWJE(Uiu|SC zka(@C;|dETf8%R#k}4e2n1*Q_d8ZdlLB)T0ov<|pW|3q$io+U;BgkLq2F0>huXh4a z=(R7j?GnyGta0fiBt$aFpgvcY~(t_)X96Yy)xlBAL6_# z_%i+)1>_iCRP|I?)o`LV8G)RNKu+WL`JBTj!svLWzB{b2%%0(nc`|BKb=eH^FLc)? z4q+~sT0Np##RLJX)iI}$_jIM)rmt%+Ms0r`zqGEsgrxtY_~mZ#!iOYxi6=p+ zK%c~hHWmZGp>*;6FniJH`T7s<*4MLK9A z>761He&j<^viG@E#w`yR6o;oCq*KNz9XF7)tS;J0lfbyx-UfSZs`!vtF?oNH%>9YX z>FLFA-I%Xef)%gT@ag%E?DNG+3)jlw(`~5@TC{l$t7#9CZ6rP2ntB?plvKPuEauya zaFa!k?g$^TeGe6G?FA{xh!7PPKn{J766m(Kv>C6P7^za@gY_Wilp54u##o-w}QBF9sM0Y9S z)`E)fj4C973zcrqlv>j`G@(bkGtoo$Gj#+hvfOb84%>C7b?BVyY98_Fqq+wIuKAQ@1 zsGjQgRLnsS?uZmFssMlrmAm6YD<12&rry;gOxOE+bH)QCKLc6Z!qi%o#sICC{=neq zvCGGf42~X8ZqEkJIexoRA6N+5Rcs3vRx2&LS~}gHv4i=D7DBq{A02mI1ttkmGw7eh zBq^i3g0zIRj8sLkk**l$OoC=(=xjAR0BOs_lUj51PU&PYajFtXUIcm-kCr@*LDhDnSX$*?92 zyQY~o${>kpBN;?{r(!D}^_1U#297dBV&F)I&~~I)kaPu^Im(!w0Lho{UC2wu&cffXf!5v!p00Ag?KNJ z@IgZipE8n;_#(=R&44S&{87fxR+t+@%%3unZpq-Xb6c}Bq96;%C8pVNMRk*u#OwB zeiP++IWH-1cJBAU##@JXqgYz;-JU`xF_FqZqAwV)qAc$XWQdOOae8McDU@`>MVMC@RI;V;HQuX{I`+HNILj8P}VySNJBYdWq3dekIn=7jsee`D8DNF zAO%$72bBRzcidYj>kn^e11GX;B7SJA^M<|)JQB{gQQjp_q)r?zollfO851JHo38l6 ziesb;G8%-6+w?vBe;G;l$@`uQmk#v+lLfN}rG95LTmQ%0A7lB=4=C_F4 zfFA=GH{d78myvV>eu}c(w?49;t$K1p*)@K4yUF3d4_F-j&yX)8>F|G!vbTEoe}H?> zWYcB>pK!Ah?p*rDltcdjkT~=YkuM|Z(0_rlE|&{3Eb2zE64ae+U6KPLcWZo zWBeFpc>|Vca0Kd}*5u821xqe(*{#?oXptlPCGuq?9oer?cBM&P>g6Pnyd+G&1}6UR zH^|(^uY_l-G7s!7E_4nb5#kH|o7JBWxOKh~tj@a8t@1&1_fYze2@HwcGV1Oe+_KGK zV18WCn&WB{O~_Ox^9|^ey|tuYqRLF5bh905+lk&9>{KQv%0#AgQ;Zik-CKK112x(! zv+i_ntxF_5g3&!m@2TDZ5YK|$prdJ-zm|48G5sFTG&quHOsbE`^Yktw3HI2#Oar+! zH_h;9WE>``Y?MGvqy~DUCeCGC*+r}R43+UxKg(Y@=Uy1hD#-F~Xp$%M+M8}tu`H=M zd6bg;Lh7sH>?k$3Hd~dNk(WD(pqX9n4AViXOigXf?i}7|P^L(pP$|!`loTI5k9DP= z*ChNh>oekrj%9k>;2p&&HTqr&@aD6=H*~U8*^E6Rq#oGFEsD4b%snw%pUF7K0ADqf zT8z`H_eKoa!%0yE*(y@{mbQhQLcWG6deu;U|uJO-dNmH#DQOPI0R5=I~pL z{n)1RKoj354rOIYg<_;~crh&)CgJ14?7SP6l*P43?Z#wc0L6!a$26e$BrVZx;vrK5 z38Q#GQ-SZ?l#0&xe4K8)DIxW|JT6$y}N z8;nZI2WkFs)(4ro$=6sSQTafo^?0(R2+aiCz+FDHjtaGdt13JC9DLPHqGU+wf!k6)lL91 z7=Mux&_g-uB%8F+9Makr>(LxlO#31^zD~UlEsEsQFGV>vP1jQUk~{`!yNZLNL53Z| z@!Z0C$H<+T4w3ab^2s6vuzEMaF3g z1!Z+A@&d$TVtYy;HK@{~aJN`7S&V7&-J1$qSOE2)_8=V-b;24Icg4}pePJaY9>jm+ zp%c+*F^T&2gx5%g2FEfhUCvkjU>w1$7Z~i))Z>Cpf5YD%DN=8I^?DOu;Oc#^VoP10 z_M*O@>(-v>$A2s;%f7DFw>a4+!naL&@X9o6H#zDBW+-NFZ2AOBk7k)(O_B!QeUa_L zqdebHJ(B6U_&uy^)Gto<8d}!na(t$xpQf&3vUdIPumOZ7rX~opDSaQI&W(~0mqav4 ySeC9s?%$JbKP!|SgNgFYje{D4>4=Nk%6!!nt#wpOHC+uB;S+N!M&s#QzvwG?l!c<=0k>}?3dr! zroUQjW|r@p`Oi1seDlrBk%8SMB_)Biwbji_(z23nu9-J~`Gw8FM5awvn^RJ_Lu!-L z&1+?~MUkS3bWlnplB%RelZkZml+r1s!Lnd!b1d4@oRHPDDkUP45}88&ulce%J6ofM z)d)snu|R`$P_TLvb)|8bD z)C3EZZ2ISn@9o(9^souTzV_UvQ|7<+dHJ40mEBwSJp9P0R}M}7&bG(Ky}WPvwnhJY zXD0RGnE8t@ZQu9Ao|+f_eA#t}XI*o})bSmkY#DU7e0KFGb1wS9p<@p}*cd$Ht`BM^ z-u~dUu1Rel9(VA@1D%(hDt~t0f#W~E;Wur{w?A9_)KjU6Z+-mQ6Tcp~cz$d3&jUvh znMRE0dG(d5BTfrkBvfYd_@$)7Nk`74?GP-TJiay)Q!|P@Ga+YGMT$)x-;imEMZ@RI z-A&03IWe=Ww5(JrjZ{S{%d1Mur&N%?hx`PFbWIJG2Fpv!%chqEE)V3vDIN_g$#k++ z4a)0PIiU%W4u+G7)@WNs(cx;YAfFS0wZN=f$LiMdbs1%$M|)PQuWFP{%wH`qD65P4 zPcd?v13>2TD;d(26w#MoS}=;ARG&F;(S5)B>T{1wsNTB&(yRVUd3NE@Ylofq?hS4C zefrNg?^wNI=HdrWdH339#svQU`Yl7AylL#+3(mT8#{GX7ed6&y``RbZ$ZxFLKj{3M zUkE>b&e|W&QXZ&&=r1#eKmF6G-{@NO(DxtyNqXk~(JOX6aPIOWuKMvE>fX06k39Oz zx95I(^Pa(*Pr75%SuZ}Wqqy_2?y582*tI4g=huvJsW%S)6Wl(BKlR**ATED&!TEl&a;ri!kHygNy@;6hE{|1oVyS-!A(iVLJnb*Uo zR4cvgE+oWn^Z@aeXd)sjeKNnZ^-nOY?>*%X1M4#Z?Ubzz1bVxNKxZ}Y6Uv;5 z<0TZAX^w$A2MOO>J-|1djK_%+8jB|6J~3RI{Z2jk4g>j~wucRngMhZ;J^`fp+aA)) zHAJ6~=CtssaqjG0Um?N$fCq5PiLR)UOvL4c+9fGbsU=31W_@u(>evUD(hoA+w}171 z1NUiwCKP=O$o(T8axZG5J`DhoUOpWO7Z=!#NJHW-4~B%c7GrD3J`IL*$)~s_r5UP_ z{;=N|24#Tuvwj6Q0Cspd0IV(2C-kkl_!N4z*PVuh`!_tmeQi3KaD%+88KCKW@&RVy z7o0PAO*TIAWnf((&|5tOTGQDL<1)xX+0@y8KKWW;w;&m;+a!VoP zYT@0+>~|Qz>cLV2V2DS~eFDg_mmWFS5NVy&!)0XpbO)y2C3_Eiqdwwfxo{R9#C1nxUN9w9!DhqM$DUxqirNt}U%&g`8_0IPCuh zaqaa5bs*9(C~N~qTMng^WLK0#waM-^x9`%+0iZ308q5zlI#=JTo^aEx2Kr)5+`j>Y zzHb{i?rqUa+}-u?sfibF;JB-ag!tBiEWNc`Q|;a9XjqE%3GW8uBh0FQedVJD+LMGv z!P-`|J`n5M`((?-`u7QGD!)&0PV}OSkWelx+M#u2x;w4P@wQm9h3v?+6@YQ0{(-s1 z2N=RX|H~By!s2L$hOo6R5Z}HaK)-*tr~-Nll`Rft|J z$hmWkW7Kn1m~mZM|MGx~^;EkF!pVoP1*CI>W*Gs=opCcGknIEodBv0r z?_x>wXyj9)x~`DkLmB`V7h+#iN;Do-qh0m{;c!xsrBtfiElHultjCP)ZJ*s@Kz*{X zSy&w)zgP5$U#6NBRi>JF^Noq=Qz%>Vv_2AlavuH?Q8gKq(%p%$yk4`nDlxO}_I06F zx<)Hqw?0VhsaBeyc1!&Ak&nKj9oQT#D(K*goUsv{3XTKkbCKj$rg-xw5=fI=7oa3? zzUcP_bV(vZKB@m$&o3r>*9}P}5={ugdYnehHi=mk)*(N=^9`dzPH-&^?3Hze^$L>; z+%>EU*FO!e@_X1xQg1p*mC_wKaw0AAHfd#9x3F2$|;; z)x)NbLYh9DjK#7^d!#Yt&Wzklt}h5q621;)V_>db zNY>o?=laszu{_P4-B=Hjvyq*_NOwYtN5f>kR`}|%!d}8f7x+EN0h&L+x#h+f3#j)w|w;MZBIYGqPpksgqb@({$Rnu`=f6k zAAaczJHK=9r&}5>|55Pr%1Q6toS3-p)Ty;!_;5$$uX{iJboR7egJzz->46#7TzA)^ zS)blJ@bT3Lq_=*x^P}zG-~7$x!~Xk^9l!h2xxe#)QDUug{#V^XpLdN%VSv{sJfCd z;{COxvLtDjfCz8xSgIAPA;qlxT(@o5+U+_&M_Wn+c$=9OOXTRS20~*IGNcPhN#XpV zkVOQ}QqHmbf;F`MAxJ~J8OT+68kdYv=RZ>({%+QxQC zNwG0{;$LrS$sY0rcIL+l!UQ zOc-#}Q01Ke*?7x_y>G1>apS(h>lU5){*+-`J{a`TyYEl<$vuC2|L>9J`Y&#M>VaF& zSlKf9etGiPf4wqOU70+4|KGp1>Y?F#x6M5Lq-#gj%45dIf3kJzf(u{Vs*lF+&sx1< zOnB@vfsJ}`VYJG2#y= z-E%fN?UB7Wa56)+M|PQfYL8YjnCu!cqCB18R(ofT3rGWUfd2fas zqWF}WCWj(OurzxP%j`^Rt9CxfoV1qI-D+5zVTM*l5g;ZJG)#C=A=A|PU*G%u`lj2b z?)kxqGscv>J>&D;k9;(}L>+i+<&Jlre{I9+fiDcdx^v0BTW+}j%nuKbeBtq(Gjv zT>4zk$u(Clx$8@RJM|Z59>4FkW8S%^ro4LWpx2&!aZ=Uuy2Jd7OOE-!U!MKO1%V5! ztyusd;qbJUvhvo}aAZm(5~(QDW@@{;+~GMOd?1jRm2gH;$SpjK7iL+;8XAgg0P#tq z;UgByrxs^T&bBT9F34Ie-(9(J_@Z4P{=9fRqiWGm5nCtassKa_dS$Mw8qURhE~$J< z*6Lh3A%TT!wH785bLE7rkj1_^%dyaq$ZD|~K(zYDYB8~V%9hA#F{O~;%C|Y-I^3P1 zM#0c%Ov&M>c92AlFuK^ne_ZY=K)j$^1g@%pESFuC9?iY*RVYBp-P%ZitwHsV^=MHYWGP(WPLvtJUZ*PvgJ?5^uH~-Ob)}&E$cRnpoI{5TagI3mIt?3lidb_?Js@t~{e_!FIG+;N3TSsE=sZkg z5Gx^AcpfV(2?PrvjX@}mPf=PfR0av276gmMyg z6SXV@2kg*8wt&3ffF|==Iw{`tp&QUf5ulyH+koapg)9V%E7gu}KpR>xKs(v9CpYT^_$Zw= zO{xf2RF+LIpDLGDP0#)v))RByN2Ik-4M~-a$N5JTKELw{qc3Pgnkxnzt#}b>P8OdU zb{di9G-1GaI%>V&fYoKz{?RC_qWc2aIHnu0;u^w{tub%Sk;U796^o@4m4B?$4Nvh$ zSZ8`V`n@;7y7=aL;J(man+eu_FYG91^cK$qn?mOA7HWdEDoCB+eXh)$sMMCw?#m3P z_2c8(bF5t69y7)?S4LO?XqNGEWrR}s)Iif*8KF)LEKf~!tLF|DFZ~?3CDW$&hMs=T ztTa94=qL;XiY&8wd8MW8;Fs%Gp+h2{!bHzEI`lyT$@{3KMRLcJBGag4F4YQv4w9doLbYD!5*xFWWV1(;iFt|EB(q~I-EX3? z`r>uBRRbcozF#bwO*Sxb#T9!nZkG?{X!Qbsg9NNRJU=QRhdhfCmeZUU#Yo)tJNI)ShmCdO#9c)yka7Pny?YRk)Ibr5fSy%&z72;A^D3(vjGMDZ` zrI6rSk2*azksHUBDN(YAtP@rrCC`nJym&TEvJK_41mnu3IuN^!y}$adkQIQ7kUoVl z4(|peB5{|SP03`8n?0GO6D>FO!a&;kXSvD5@6ke%zRHysEjM+2kU;YO7zXc5>ITie z(quT%V;C+~fKcHb!*G$yr&fy|!*J0G2{2qwUjs~g?8uCQGq^;azEKl_jt{#a<`_di zz8nx8=oQSaLc4AU^1^_*DX#sQrGj=X02;`CjQ6WD?e$snVZ~sr6q6GXiN9coInH!d z=28WS65guJMJ_N^#kB`RS7k0*6#y7y{{{X=k}cZjYL%?=i*n0YD$L2oNOG$KM6CDE zB-xa4wN`F|`INDiJnfAHnfJ#Tto>rT*epO!k26>b0&&7S&R~(orwq~K3>ICG!0|py zZ{8v;O**BJU15@i5S*rD6(70{X9pINnuZw^hi$e?FdttEk- zhj(VxDh{yI=owLKWu(sXerZU==FI3Eg*?({P19qJJ6#&OQ~`D$-qO%TF1;W97vZE! zLl>{jM1f`n_5Vap?LV56}Hb0wVQ1a)*MX%8^DjsYq?yYKA4G)3gF-X&^#)X$4M^e993`D{v}=1XI4Z zKVA3FT*K=`^aXM}sdO(OFRsZE&7N`@n#@E0k`WCNl?MU^eE`%|3D>Z?NGP8owJJwD zBSDq#^-|aV$OTnHG{u87>DN~pj`(nHv0sUup>diJpfgS0<~AR1sAVq; z1SQ@|9H{D0C{$Y=T9PJblS4K0<}bf66ij5=WHpo`$Nh-CONV+7id`U|T9yl4+7}5T z@0aa*KQu^+6pN9o_f6x%92}Y|U?~X12XEPKk;bR&&}F+t7bI}J-@DSKz91tj-PTvH zn3qHMuB;`2=-};LS;g@wJ9ID2stgi5-e1Y3i)|Vk=E=}o5w+g~LBYF{%M{Xo-VD7W zOj7{~iiz4z#8MCOl20*qfuaMNgyzIQDCb$KD9J73T#yd2_ElnXwbx7EO%z) zH2)L;JC{apXyD5M!NI$sffvT7*w7mqcvXA_O`{ynkefie_4e0uYuMDpLqp3I1vFHc ze*xMDzb@Lmz)WC2rCT%Iv~MU2y=0AL`?bDTY^WpYbxEJ~hv zXC{Y*l=(d?vmg)}+&wE(8Zb7+Wo-C8D^r&Oz=2pA?~fX5uoJ1zlck8P)Fw%4R@fTY zSsu9B*!HAHja{k$VZu9V>>?K!tKzao^r*3mRs{eCu}nBCF9H~O0AxMqL^H$0JJGZp z5GCA|7ZnD~PjQ(ge&t0~DF7OXRr3DmumL@Ff$Y;7^MvTpVPORzMtDbug;IfeDlU6O zj}8lUDgZ2qHNpuZlF>lH66}ZZK}1#(h!SoPk%{9|hWH>NQw9m1<(_8^YUrE9u(0zG zwi*N8UbO}-UyzFEzkP`XtQ8p$@EfuK*Qg-GdNOfY(Vm%IO1$PIe|IaJq0Cs1tt`-@ zAjW!Z0{PUYn7KSQbr?kOo4EiGA#8q9!A;Y`wk6EXPooUbz94RX^1|l7;n3V{G^(*q zfsbs!b!pxQ;1;#4B|~~aGQyu!VmH>%0325gIG*tWaGWeY9m+HS$7#ZV@pKe>e3FlMb=)2LmR6~N!`*)-5O4LW&+SPTk_D{WgY@6Z} zU6|vl0g=OdH#(n6{#!lKE0=RTj?N|f51(^9btK&bk~QZcD~ zij}}pF`baW^8Qf{ZcsFJr)1INPY><5-LO~mQ4ZHiK)~=G<#3hEr;yP{LR|Gi0&TVD zdt#ghrk~CtT_YWfK_E(PXgg#!f&I7CYjU(H5-i^DmuV+aGfJ3TZ@O5|H)GDz^h4Jg z#)$5h*~L5XcF|{#>vVU5jUxliOXkt^FOC=yym{XgJWIpAK zO>HiEA%TWzt(K7!K>X7c%rAFZt87^yR{deEIN|*_**UFMRvjdWRPX&G<4tkxtwVCb zsbU;QNe7oC(o!q;{s0RfoK7eB+*N^yU5e*P<(AK<_A3f&eIx)g{RiOEXgVXsYT2yG z2>f!sHZbY}5xlJb5#*KgpVeCnY=0yOy}ycPv0*AiafpkaNExm_y^6+J8VDNRRWweK zd}`k4RWwe8kYGaCA2eV(PfA2AZ?4?A_g;e}bAQlU6o?Vx{-9MJpE6|b4_dWB0%!x; zlsGRzy!vFybjge{A-vy+1t`jF#yS62fY@ycpwE-}W%VhNYOgy5iB|7VXi`gU?>jTx z%2uQFgr-XsAcuG-G+pHKDRcCMri)fcfZ;i31TZB^k|oG_1_4`k=ZuvGVukOVF_FMT z71x zI`kE!Q#79<7s=b^NU-&n#ba4(dJpN-D2uh`ws@>A5WN1jcuYW_;+NavG4+rjL`cgp z`~|ClSRUuzC}8ugnU>*J35XqHT85isKIP3!%W%^R2{eS9X`u#Y#DbYP^K^%(0`Md~ zV$QTkDjlx;$Lh@-WzjcSM|yh3z8TF&GP{mBM8m9;Gte4D(7hi`RR3)!Utn!b28gF; z>b>9Sqj&!XYhzM0E?l_LjXqmZATW3veKvV~I%&|2KASd30D12iGr5)Sl$vZ)q*Qx% zuqM`)Bnf@(JW;J@TxV<@Q^z=8T_9q3j&VK#eaakljPt371flniu~?DXbV~0aTXd5; z#;%os*x@>V*Va+H-$OtU+BOoQzoB*17(z-G;3@&2S8I*90PW37Yqn zTRfj~*A8lXB>4Jks%3Euk+I7?)v~%k0Q-BYWdiyX!Q4|VQx6HkOZv$IF0Uw^UMnjq zxh^^^spRmPx!`00sk3vAM*A0lKwgQL&?PpBb~$~@WvW-5fkdbGc{XOBk&%@MM^h3P z8fAyEX`YR|&HJR7G-J_U^C**FzKg30?Rs42Ss2f0y8-D+c&jjd;C6jWFNh!kEF zR4A2CsiIL?p-xC(d4Cmw1EfvJ4#L(+;sTvFtc<3H*XR-H* zT4a+?d*Cd4KQ6h+of)37_g!i%E@`5cy(|zKyhJU#Kwx-we|FP*12(j68n>?c#y2-t zJv;WL0ej@f#*baI;w#(sZjr}b^R1_5jXw6n-LoDXS+;BFZ_A%Kux3Kr+1tl_P(Q($KQFC`bEl)c5^ihLW-WNEkq@<+m$5l&rRxYdv&_pe}It4&fUe?lD zUR6;kManCu%H0M6}6TG0)&?; zY83~JPjRM-T9qjP9!RRF_opJ7_dDMQOdV-^VMb?l7VCuL;h1-#5CGl6bTe0r+cy7mWfG9-TIV5mTlInwb|CP#p!ld z0YZfAbUWn&8=>M_%vqdnr&a|323gf1Ol$25xfoK5WY@M!iG&>E!U9X`ZZ#rH=CtN0 z4a5p@T62g5CaSoM6x||eawt>)Ops|U>ix84ioU2zR$@{rB}bT-#G*`JqV`x&9tcz? z-ee~b3XD{78L3q{+PMIzAQlQCEMWFWla%gA2j`GC09s?obqp*)Siq$Y5H7^9fQw*0 z1>5!ftb*}{k4e#`*yJ%q4ifekLr$^ltD*!ggG>LD~ z8YD%E#rStG*^w$U&}kcCv$B7`+Nssc_ ziUN_sJIZ5|$EPIGqdYckkO1;N^3{=;6+-E3UU?9N5bO5yHzjunXiiP zBv25dpyo=bf)%pV}=+`7Xa9e0!lqJtP6cZdXLsJNE@W^~-4PysMOmi?0V z(Q#gM)9|o4>lhlX<;npwFUdixm|PtSg=(uqOVZ@Zy->}(`O7a11rwPzSq-J6aEF$w z7m7#2N-~{nRf7px4JQ>jNMiIsMQ#o0xnUvgPvke`UqS+5bae9Hm9kV&m30z4&wAQ4 zsUloaSvI|Vs$5z%U7IECDYD+buD4W*W#pzzD#kq&!vcTwbv;(f?4TpE@{zso>`!0= z`QL#Xwe4{7U%c1#m?%CS+4OZiric}m@?h!Y@wJ(lno;DL2|1&ZVAm8u?KO=@ZqPC*Ii2=_MwaMdCcBmt2(}n>A zPI-j@wA}M4L6h5@30PQVh+#p=uTA?xtcd=jn-lUUt9@C6HUUr(d$hkjPu5Rytx^`S zR%AfHrysyEAMbDIS{6-2lIyq}3W=;@eS1{PG4#ZO@I*iQEXW6$e6;LLK!snS6@UO7~Vq0?PY+4Sg8sK$%mAb6>+O z1cV1~U&EBdr^wKK4O0&!P`nRZ=@Q3d&Pj{;t2A(BD++`LFK}g($EWDfz?DrKB!F<7 zRU$j}SNTnN7O~)+RZC$YM7YkXMIxVK#5>OxeUL!%J_1Ul*4tiREwjUHGy+O~4P4pa zML?;D`2!d<;z(++4)ApK(&V`lYI+KD$89n8vyaTWLcoS^MsqGT(egL?ysWfH4Zgy= z1~)>Dv!yh*x5#d98p{11*z}V3P0tAdwu!}cOVdJ5g#w^}+|0DpJ1F95vJD@La@#=H z9OyL0;ZgLLKpa+ij{}uJXCePsJfD^?py68p!5a@pBS~{etK>alqJBZUB-qH!&3p z3LL$0&3f{dT>t&0_sUI^E_7{f7JkBLxc&#ndj>||04AVOZ9u%k7>Gro1_LQZAQlE< zbs)Ag0piIsM3qfEcx*(ZoGM*6?lsyx|L@zMAXP3_G0y%jt}#xjnO>QB!Ko!BIjN4x z$@!&uB{9kQDXEihh=v+LHHyMCf~?=js%ps?5;nE-#Y5R%pcOE%9K=?bs3^ubb8?xO b_T~j*p^Te(C4Mn8?J?ObDD#eSq5%g0ls%}ZUmA|n;Dsk z1qJ5p<&t9!Z}*&W2?K-r|BDjpt(ssNf+y8ofx$EP)ENz#y<$P$rFWGoQpSW~L=3K+b!{i3aQd Dl7~za diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb index 7c786df95f2e67a4cc1dea26858f2c225062dd1a..563d669faef65f08c4fd67d5285b9b46a300ca06 100644 GIT binary patch delta 811 zcmX?-(vdpBBxVZ}1A}rM1H%+%1_lELAUn9EC^Ij;7|3Ke0u*BbiG>C;oB*-|Ky3F= zPZuC90hB1v1M;16@{@pk4;~v4DW^);jeCtY&;R@O=lUNU?EsR!vVVqj#bXJBGD z1f(wjX)Z=a1_?$chCm=452TL+=^H>=hKZ3umkH<~AYfvcrNhLq5QtX*@p>TM2E==H zz>-jch2e+}3&Uw3z68WKf%pLsKL_G>K>QVm|0n8CV(gSezM{83LG^futYP@3RO>SmU zs^>-0(y&0GgRQdGiTQd-cYffRi>#+Jo@Y)d+WbZ(e4?c1<>_7FUnD$(^YY8nauTys zJyYCM^HPfvOY)2Kl8aHy`KVBv!O`-RvvIqNmK}GOuZqmN1g;kq#oX_mKb*N|BVflP z4mHLepE-?|3cobWg>GfpZU4(8`*F)(tG&^gtDYK85xcmAMd0L`CXL9+v8?V!0x&-` zHZ-<0_B75==sIF+k!W}|xv|1F_}rH-dk>u2&RTN+@%pH~P1{n8Y|<7cdS-eCy2g4&#zv-=dKTKr#>vTsDF(@@sfkI3iDsrLi3Uc7 z=BXwI#ulcAiH4~biN*#77G{Z)YuV~qEDg=fHnHE-Vd{HL^Cilq%klt ztOU|qf%JPI{ToP|FfuYYFfuW$0Mgrm^lu=|#RSs90F*7!VPdET;wB*O1mX!mJY5GY z2_;w<=IO97ECu2z?_ET_l9U;)Gq zn^!X)WR%jh{HMCLKxcO7rzF$)p_$ehEv_9ycWPRN2WAA!SiCU@oH~1tLu}|K?qEycf z*U-?ez;b+L@+nzgcda9peKNBDmOKnf{ct8>+MK;hEu4}L?^c)a49?3hPs>TnPW4Q2 zPt8j$N-W7Q(n~HzGUb}WukSL&Ulb_ zhD?rS<Ia!cRnIBct zjmfTTicF2SC+Dz9TN>*b8tNJ7n&=rBniv@CnQ14c8m6VC8Jn1-n3!3bo0%Dzq?%a( z1n diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll index 3b7b54fe1250044d89278e029580246c81dae76c..ea550334f4521bbf11e5a9d8a087b05e0e959993 100644 GIT binary patch delta 10 Rcmeyb-Jmm}Y-4GcC;%I=1fl={ delta 10 RcmZqB`L8{pY-4$+C;%F{1fu`| 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 72aae98b..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": [ @@ -25,8 +26,6 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "D:\\涓婃捣瀵岀淮涓滈槼宸ヤ綔\\璁惧绠＄悊\\localhost-nuget": {}, - "D:\\闀挎槬椤圭洰\\鍖椾含鍖楁苯缁撶畻椤圭洰\\婧愪唬鐮乗\nuget": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { @@ -81,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 7cb6f30f..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": [ @@ -3057,8 +3058,6 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "D:\\涓婃捣瀵岀淮涓滈槼宸ヤ綔\\璁惧绠＄悊\\localhost-nuget": {}, - "D:\\闀挎槬椤圭洰\\鍖椾含鍖楁苯缁撶畻椤圭洰\\婧愪唬鐮乗\nuget": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { @@ -3113,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 3e63b7c7..141940ba 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,67 @@ { "version": 2, - "dgSpecHash": "tSZslriUzptLn3fT1NvayYI2wDLD8G+HgvJxyxB9sQe1idX89sn4DGjTVPjZb9lkwQu34K2l63l26mh9A5BskQ==", + "dgSpecHash": "CugfBKjayiD+GhmotTe3At90iFNx0Pi6XhbVBO993irp5Dtb+LKaC/9V7bidoTRT9vBbQnaftq7cMvEHm+sOcQ==", "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/Win.Sfs.Shared.2.0.0.nupkg b/code/src/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg index e25e8ff53b0d2932362f9f415e1c96ad07a326a6..001b4a995ff8bafdc762e7e32d460ef306e5bc90 100644 GIT binary patch delta 31437 zcmZ^pRa6{J7p_AH7D5Q_5Hz^EhM=p=#UKVI=JiM z`_I+6I2ZlY+i&&mwYzq&u3ps*e?)0|L;|wb8%w~ zll~g{BLe$#=a#mQ8z5_YENw8oCSF7uw5rR@*K|#|S>3-syZ*-wTY-35xvAo!#{Ir8{uG0hJpAepwLt+og$zs8uzMK_PB69 zFEKQeJybb`1j@=-1;(L@AR4z`yWPs|nTkrS?FIKE3~#_dwZ;eO=b^cI)hxB~$0-Cqy7?K5!SOJ}!t z91?Xhf!A*;*Auf3kxRNdz}Na)&Y~lp#dxyosUdrMsnm7%o|=$qW}Qzdg%Jx( z=_21Z**|}YB**y2ea2M3T%i+`4tiTDrtoDGbSH5g2IA6X&QvU2CZIBYQ?IJQ-_>DI zV~3zA|9nidO@db_Un>a`mF05CXs!=kc2BzarFqaUV>Cm=0W=W|x87i~Ob;rp z?6UjU9wsjs0~h(Dx8-sWMxC`a`FdL3jc-uyDtlCOvMFk)o%c=T|=fKUo~6l+ddP@u3g$J`3sWJ6BjFwQajHYJj|8CfA+;@!kiw~^{@SNQl81?%mcR{S4-Qo^v zDGc{Ep{+=?58I#%5^e_5QI<-{&$$#2+0yS35y$T2K|cr0J~qRQCt}~&TJmIVYi{Cd zdWxwA4{Y0StarE7q!g%`yB)R$vQxUchqjMd|As0>=aI;DA6Y0y9LrtbBw#VrT`8Jc zNjtfh2%jdwMmj4QZoV^^j!hwg-iQXrcf74{54*)48;A!P#bLv&YjZ|ib(i~T@%dS6 zYg*)g*qJtRRo3Z#dYkHVDtBEN|0^8rj}L=pHCI!&bdYQ3&a8#ixY9c2E=^I3V%Aw7 zr3P=mbEh-f5Fz|9+Mbd{!@IwzR~FC~XOBt&<^B){C4v z>6AJ=KQ2t2zI6Qko~^!Coby9wdG0=yu6YirFJ@Bb%pbSu zot#?}YB%o&4R#FrrzZ%%a)^a2e~Oa~2W4(tkkh!KV>W|CZKg7^NC%Z$gvl^+oIsX& zR%!(xdY+X_{@nKt>u)LyeyA_f<7;sqqWj5=I-ln;hr~FphUS(k(ECMXy^-XV7|dwq zapNB+q)CN+Z8`~iV%U{EdHcj}fUhdn2#Yi#Frqdf@^>UYH>>(r|4N*cI9?S!W92Qw zJdWX5So)+H?lg($c&BmP^mdYlkAF=<;xH2($gv(qKv_-Ev}M;(|1`|3nkG}C_%_w~ zq(8AZu)ch3b60S`XJmwA=z{y|FRAa*(ae}p9(v!rJFB00Hw~32#JF+bKK=6V)6^12 z8D=sP|_|Gx{A=;X_N5Kw54*TRhjy zV}l=R1SiBOD3%+ueYS#RMW9Yfl-%I;@~ULbZ>RkN;+b==MhiGG$t-^O2u5LD$H;c6 zRqk94gskALUw>hY8C4jIw(1~@#VG_ffXZL^oQ|DU8r8~08W*N(DRIL@vvtOvP?sfLZ*od481 zYQF2sWnS;AGFlSW!_h+L(g{9%+oJDEzf)Dbq8uI50=nuT-&oV4hFE03l;pYz@csr; z+xD(Tzyf*=@xd!|*7vPBqj#wPENiG+1QabhlOGa zy>FAG`iva5p0k=CIM~`8$XX7{vwQA`CRm|qFF9y3Yht=Eeid_b5@q+KtI+hFUc56k z%L!dyr#Eo*RW3$+bKkm2iW=X(35+sz%jKK<9cBmb+VZt4SKAOx|_|YzKO78V2x`?N5@Hr}`s3iwFRLwVa`&TkY-W*Pk9z($ zb46bVe$5P2Ut4`};~JFIs%BAy+v=?M_v5VnT~$5L3#od)bWsfB{2e=Vv~gmn@OD}w zg`mRci_0WlqynXQ2uiN>2j2LvcO$Oix7h<5Y~h@y)ZaSFn7kj?4_86c^B7m#a^LU0 zMu{77H>_~LIzA$h_YO^(* zjh?;XJnw}ptbd3yO_ymiHg6GN?-KMVdh#b6uu1T3oVN^(;Fd9)H5ib+vfPtWHMn?+ zFH3;CVKTM46$L_uTM5*_y&Et;iw>_$VW&qCd@}2R5oK$Di z=h_-4{PRB5LOHvh_NJH9##!H!b6vD-4$_cA%T3o8nKj z!Q0JLY>s%NVx=!z%2a)ot1F|XVr3wk##GNiXGqY&UYO40YbfgiQrXa#jbpmim!(nJ z0LVJ)oBv{jIbgjGTpV!03lK2x*fzwGrp-5eNvx3{`7)Y$Mz%nX(EhhCR}*>gr$}d( zx(H2`6o9Oh%6UV?W9E(vo^@vJ(g--rO+{N@Hk1inzxRcTHbAz7sgk`=iC~skBf!y> z%N&K{-Opb$bno8?f|4dJuDKd~#qDpVf}dO$xN5()Si6O8uD?c}D@FgBa`Q#YHmM=$ z0wpuP3UF*{eHB{O$hZICP_^oyVq}RYZ659X&jN4GVGR)dw=xn;T&F@X&%P$AqJK1J zh%*OVLy!I?O@JhxtcgSt7oZuBPONr1>k$2Zg(}3O{^lvR2gI?4Ba!E#4|j1`Q;GIg zCV=0~>;9R~^d6vFn(S?Rj(M8>2`do)EXMs=jIn(|#o_mA*O1k(v$sGiv2%5oCQQt= z4PxPzSx>j<-HoRFQ_Bwrle9+BmA(ptE^SRer&` zR{-5BhiyAF*Hql(#Vtxjj#n>MC3Loocm9}u+wI-Tj!&RPYRh# z>Lb$mPwM5`9ZRzsFNuopDpPBiC?Ds7%}wfV+Y56J8X^KRy%*_B=6WfJPr{g%8Y6@R zPSWJst!I%)%jl=ex<1gr-dUXIX_H(#IMR!Qj+qj!aACe*{-{IH1?a_7SqbUI{Eix_+HVmkXMQ>tNL8Q zQcI<0Gtc=o-XmG*$|Z~+EgqDH$t<5@5ChWkIACV;OkpbIpaT%_5aU_S^7VY<*%opq zsA}s47`NINX36#1(~Z;lKhJyP(_gl2Da8y3it#`4jE%A~ScK@fHOVt?)kU zHZIvT$_>aXH?b#s%n?Q_PRim&@0j1b{@F<$f0627P`X!RPn=j9`7K&;PBu)=$_|rm znvPdsa+)p~_YFPh{RUu!&lG+TVL8Xn)$Lvl^`U+h{`9gVO30Ay%%LN@88C9wx}u46 zA#OAn7;muHw*T#d7YKZfo+&YYKQ??&)pibT-2l=p?}?5cwBG*xhpjL1vQ;5Sj?k`f zg6_3|h83P%+L>$VS;L=f<+1Cuh@=ydZ-ZsKr@NCXg=;dP8>9Vo*QNXrniL2}ziv>6 z1^u03Q2gv~!NU(X+@0L4ORmL!9Db2+id!j`ZR<}^!>rpu`~rc4nr8|OUgtc|FGB-*(1(DpRU=fV4&JG+~0-t8>n1)Y*HS^p$0L!?PWC-`8w^( zf9H)@LZiU0kB}3;xsl{IV|@humE7EZU$J(UM=ROI6A%czy&pgK zQCu)q9~?gva#Nxl*!A;`VoAjIGshZR2OWqO)T^G2IQUGUojvq;a%y% zX_jr}8OUXM{^gP?eUt<`Q7RR~Rg)j_>E5vuS(0|MT)vGf*iL+8 z>32xxCZGm+6dG42k6L`rt_p^Vo^;I&(~uGgQ$a;F=9FrB9{v=+<{RV9v5P&DZFtR1 zipQ_Gi!jrk$XEDL#KEZNo;4fXfoPZR{N^o@KXlP3rWi5omrHZ_-|bcy5c zNga?wHs-d5))`L8w*)L8f)HokRzYDF@6m2nzJ=FpYa7Qzu5N#MrauU)ZTSi_I!cVb ztqEuDpk`n`%&VpLAE*u&^^?ek&+=$pg~w-zN_4s9ZA!^is=KH<}tjdnwv9CIz>aaTyC{hc>aQ*i{aHBOtxxjz9ee5O+ws-2=D;AxT`PELZC-rAQ#HX zXB3C!tDgv=zfe<)xuwn;yKBfmhllZGJ{t!O!}T0!@C8X$s&g&+Uo+ho==;HK%N7j_ z#sDa~-kwFnmbor7eC^nRKzdI#`X-5);~kV>sp#nh%dasbF7 z6t@-3fJR-TZjXLcdvx(O3*1EOIopgj-&Rg({G6^WsdVguSyNqNW1LkD;LjimnQiH5 z=_Dl3#V+u!Xa;qN{W@+hR zu+u5a%c6U;hcO=$VnLWnkIx}w+kkEjm3-8Fmgj820(SP=FV`@5KsH(g7H7F7vazh(;VVj1g{of94O#1V#txfnuG-QQM$t6uaVt^aY zjkALWOiA1|)clw9X0L3L>Ta#TY;a!7UeYaFOZoOc%L;F! z zN(fAm+R=zh)`&}gydM42cIlls7ZZL_k?cxJ0s?IGv;0<_^<1+lI(NxtI{(J^a!EH@ zrO5xrShD_jt#m1iS!#nvDrc<7y1h5+OPlqPbT;*Ud6-LH`xu|K9JviFK|eC~!{=H9 zvkx!j1iOfje!FA!liz4hOBwFEunC@aBnzd-$ny2c@|DO=E6{}%g@+Hwt!;=MODufu ziv%$lz5^SM9ldgoAL?1LX`jW1oDf#$XBz>$DovC*4fuYdeaV6mwWc{rT5-(A2{or; z++4T>E`pEAT#xhEp!f4QN`>4q*IbPF1G#z)tCFj>GmCKsOyp!SMUOoAQoiI`Ze z@51rpqV%@#spA;gAK%0;pnBs-cEd;0A6b`nVSmWS`^nSb%$8$ht3XoYfAhitA@A9~ zENv8~jWkb~{BZ+Ur4QnT`=iuV#y)-=$4NS~Fi1c2ZU#mAEHD}-1~|9Sy%|D`8G!EU zTG)Gt=)L&h{B+T12V6h-?i@6)Gru|qE0j_k!rAN3LZ$Ksx(Jo&_OF~a`eki~ZsY1k z1xV7bG5gLux)$Ay2w_eoKSykc7Ti^tjF`M#QC3s&6?y2A*K=%m{Kxx=G-LTLm>Q>Y zrB8lmO&FAij_5bMo{jMu^1|^!cLB*4z<9k18mb+B@d(%~vf%zM~ zYsOwpQ)*U2Q4(v;sZRMSzjW;rG1y*e&{(_owdju7xCl#&N;W^KF+$aR43HVjdpY zXbAn3lYp`A-RNqdGVf6cvybyd`}G!d#i47R{Ayi(IU6vM10UFn+4L^+(+)KN$B9dZw!+6oF8sP9BAhJ9W2R>TIcq* zZBQwC^jd@FLOCJ@?Z-zTCzc2?*Xu;aO0Fr82(i&BO~cio1QA#L#Jc|FJ`EAvkYu1P zd?T$^3ci+l>DvAYf0@C0O}U~QF~&Tv(_Ixb_d+QA(0k}IuDK6!Vg*WT zngiS|>XvxzS{!(lkyVvMHtzucRQWOjbMkX(%ZmovTtUNEyY{{p?ts9^N1_N7h z^KGJni{HK*j;O~wc}ip!Q_rF8yGqD|P;05YJNA5!mLJ7Z|JvxT$yecvRV$_Fr~aC( z?u}hd{R@|4Y|4<4(*%7bG>Kg1H%zU)s@V4gK;M&#dK{>ib-A@X?wx?4OE`@u7Tp_hLwZP$bCisy#tI-VXHLBB>u!v>P_~fA-9kp@bk+6eL65k z!&B0FX-|jP+2S{6t{(Gl(UriJ^Mi4JuD+5dO)BLh8yAS1mS0~%yZ5mBV?u^(y09wp zsI=KA{B$8@5@dLcrE}n+g=FJ$jJCs=I&y{<={rmzAHz=%``buSv;XaQfi&fI4NV#7}~Mp z)+nfpT@%vY&9QTiX@Yt4MV?DS??PL0*{hXKIoVF?9wbh(Gpbhd@6h6?fuDGmbS>?T z)`&G>-M`>y?n1do8K0JKT98%V)@pFJlfc~9xI-w%S7xrr%kxw`ynYXX4aY&R!k2t* zeXzA}JzM%c;5Z8x$$$fWBVF0a4woZSS&Vw;qdYZ`EmK}8G3KT1fn47>uDkCf;flUl zsq)0gUr>B$`ofsy0>HI#MrGStnGvEy@N`6Mo8H1wl5W+ejO89N_Yn=r{#chE%vpY0 zm!Ii&r?Nk=gf5@5T{b|KOg${z#}AO-Iu|1@<6mLK?RyiZt_5U-`5SnwzjX00sii0uTxVO zDTRXqrO~o=!cSS5Llu1SacZ8Ej!Y)A+K7{(p_IU4Ns=u2AZIqCDnBoh{ z73j;oMJ)7smY`nEar{hJMo7S*VAh_hubO|chcCD7{ zuK#oMNv$p>tZClKfoEcAA`=%e2T=Zze$ZK(ZlzhhnDX!mcBMaJ5xWz2uN5t2#X$kU zh1g9Nx^jlMAcgn(Grh?cOdDS<1(Z0sgL-_d3vqrl6|K0(P2@P_OQ3Q@hDjTuaAe4T z5+egp=LC6ckab<&B?K6uJK;5A0q*!3hX8l)06Fkm?Fi2>IFnTrJRhoM)?x(os5Pp9 z5>(0=mO)*H<=WJNdfU;Sk?^R8LgNbPzIlrrkR{@42V7O|JPYdif&FL-p+g3uV3R8L zg9>`*+g$;Xb#9Z?=HS@MZs)#oX73O#NaX}^myJBeykgUaoMlMcY_{gwYA-3dOc2z5@p!W< z60}s5o*!WMtU{Nza|<5^L5R=ic*t;1a>LwDG!2{pabTIohX*1Ay`zulNS^da*rm|z zhsH$5mLHPacfiT5hNhU#V$*^STgCH`4fR4NTPL)usNhn4L%HyBu|~S{yGUO)gERN2 zu;WarFDP~d3#Gc4NTcwIix5w(f(o6FVm{w1bXY57^QdKf<21r6K;(#G{>iv0b-S)t zvV1f8c3Nk0(VAr+#j1=N^*u!S)#B_-ue7FEH8XQuT0z$7@0S3HgDvvU)1AG7iw zu{iW11vLV&IbI?dJTL)RjYE4Fc4HHzYtP_yKyMWAFMp-cpkvEgK@)3fD za%7%{IZEFzh2rhpb;$WcN4Kh$Xwz_5UpNu6XK90;E8QT6^JY@F(wtUuuH1DZHymDB z`YAeS(`WD1A8MqI0~10u)H5~{XAA>uobwv#Zsi#*iUS}*9BQ5A$A(@;WV-xXJd%Cf zlPu8L>;O^uecDen>N$G|-v15@@xlDXsq$5zmJF;ClNN5ma+g7-{Yy%Ba#+8|5MN4w zFd+R}a6}njR#L>(H>L1HvZTdU;YJsltG$D(y)hroerz-bqm*u<6K%G}9@ z#y2tck+!G3EqBZ2KaK=Qf>QKT;z2{&547P|7IGlLhpajq2F2y@o+q3%++M6F^4rV~ zXJySr!kj#2JifJ89azEEpO>6<--_(`xheME1*P{s?KQEwf3|9N{?MrV0)`$)OnYrR zxQ$X21VVe_Iexvuxe{Raz-J}2QIv4>eF5dhG)A|VYl`5f$j|h5RwR8MR3#HDeM+mw1>-@yT@r+?ED zNADZh@!QR8Oss05AY2kY%kNK>gyKSCCE6oen;evQoant zXs6nVJ0NTHX{#3E`y3ifV)a^84KI6A=J?hE)N^!-7XIp07VWYot+$@&|rD@xUja{PALA-l$rQ@L2J&rc)Ba3){GJHs`$%^{&NO;0BwA|4k zpm7R<4H&g>P{w9AV>kA9Jzjud8@j6Xmgowydw`5cWWDoSI88x8Oyt(2D489#wVPEa z4H&M$aw@IAM0{jXDlU@b`bqQ6`rYRbZoRp7VEN?_DdT7a zU!$m7nwMdR!kcTlBhU>h-qGJUbt#T#lIFJe`Qe zOA+jjQQc&oxqhMJr}+r6iB{^TWlhen89lD7{ocJ#Y&`|BIQ8 zS^aVxHSR_3s{?F*!B5=Lo3BOLEK(C?SsGJLtkPFla!bOpUQbC`kFtvo3)fzcI$N~R zYknm;wqKd=hJBZMN#7B*G@hiR4KifeUQ4o*RMSwF@;R+!Te=hT-#{xXIR{tp~^@;mmtr0hsUX8R5@`_AHnxJnfqlz*q zqelUgo+*&O+oz2fB1&@5^A4U3}iUUErHKIqbQ^kUJGgTt$971N=m#dRb9vq51_R(-W>Cl)USLg$+b zJkD9QmAza7J|>eR?F16yLiX}0q-zD96gcywsm-M>{aI{9gDx)p`gJJnWT*}Km6Cs1 z(9Fy!P)>CU@3sDMo<)>SV9~_dL$;a9{#ZL-&Br9)3NbZG)~1MPn0V zbG!>Pat5(mjZ@aqQVOG?tMaF3p@-ERG7sZSvxXpqmzgsy9q>4hzAXy_ilNR+$@;*_ z%!Z>tOL1@=;S&qF8Dg=(Adr)?YTM1$$Y$nDPg0Il8Lms&u@mPMf)PX{MdAm5Gx zxMT57WBCg!Ge49|Ecnt*eV?YA z6R4*$*_8QhBke`Xk1>HEjc~Tj2uM&`>d&GME{HxyfeyfrAL4b74}d@)9_~+Kza_#S zmmoi&DvXzu0+SvSxsmMEl~FE*S79So*RIJgpjoFHx=yw-$hY~f7I5g>-KO-afq~`;^TnnzUx#})x3tX6 z)x04<3_NhWD%wK%)r|SKf3GArCGoI~0OXF@Y~sVvC^Pa^RBdf%`j5;D_!9_~atM zFX%2u1=r3=>PjptcLH(#6XyhcUJX}`Zb^X7eM_|(a4hnIGKtwxP%%So&(zLKoI!@& zlTWhC_D*ODPXrH|4zMj>x61}wcT~Bn2E88iy(O3l+P1p9)bt3I0r+HFod&#^w^`_3 zt_b84{@ud=5lAn5>%%V#Z1aAzJ!uDC99$R6W3oqHP`iGU9GgL`OI%WrsCU3Mr`C2} z0?Gw!5rONU0B~4MZ)js>o^d2L$i8Fz79N;BU@A)iZ2~VhUB@0m;ur=9|WTZI~Z#sVZ0 zxiOXi!HM&N8gX!4*Lfz^8ANUj{CZ5g2CBzr)R=*O)vSk`7oPthp*fDwo0J6)8Qigo zY5+BFsw!0fqdiI^&aoR#PRYC#j){yDAX&g0$C%WjCA8+vbW^D8@+UEwLYIQJPlcw+ zSK+cz=RuN=z~tuOIvbC}ZpDRjs3%K+=?T#7}( zLs1LTXV5eaN(C{y3iw*o6@}O?J6M1u5^iHX24ZvjU|jzErRp%cE3#$+puHti?KF#+ zJRMkfDWw8LL%gG)V$i1A^P6i!yL9+CS3n4KVEABoSqb*T9+H+ZFpO$V)3>a2WQQE8 zhw1OXscVnzoRd^=2fGxRLIr`NwQY&~(l7ff!TC$jcD!Q=6Z<;Luln)tO zKkPZA$JTH8atxgzr+zz0ZhooDGJ5Ir`)4Mt1q&v5S5x3kPvgf=Z8H9kp(gCjaliaM zXgV~Usa&b&0?wrs+l|ld|AU7jsQqp?Ji+^FIx&Gq{39NbXFCRS!SA@M_a!=iPpFHt zU$-sGXcJBy(N@0RZO(F#xkZ-N5qaj~PN%#UgN57chURS3^OyY|Kf`kfkV2Qz0@1(%VOe14)xj2+kCOr~0jq?{`OD0O> zW&`ue|4^YL%xvATBLofVvbBp+7 z{3X?F!>|2w$8m?w&=4T}wKKFm=1x&DnRP;M45*MT$};DH-W zpeb_jL&$t*0S+K5i$r00q7NX(;?i}(;q*50ievG)G={B)hSX7rcTXG=`Ov%~PAeo9 z*lB~U`)J1iZ2U*>`|>2vcWJY8?_EcgKnp}v7Ne2r>{ue8Kp-RhXcr`g+=Qjx#nSB9 zf+h6H6r>W05HpoN)(_Ezje@~?@GfQzU@8$K)>G*>a4dw`790<^`PxoXp$Mk|Tp-eN3m}#;Pq`-t z=GYJn_tgS|wgt;Tw;zGau31_S91OwA5AR}X220}Xlv`{)SzsTvlKpI&_e!DG3tPG@ zfUFTG>eLc}7Te46PC&BX7N$-mlxTstpc3jS+ALRDfQmGtn@tJw4ASUjyuz2=} z!78J9{RjzKpZ?0Y1aZsRGlU!Ikzk!e9=!C_nV{+tw{g28>vsR6-%?uzq`I{j5*4o% z-sq|7%LfdXS-a6be=nA+=0Rf>-&4km{?GEbVnN!o-CKu$FpdO*Zl`isj6d@ZJd~py zOb&+9gW65-XBohK#|RZ|K8%0B+O|p>D@f0w!|HoK9Ht8EkOP6A#k#olb7u7bsX>#F zA%`M3;dWA?pgl*F`)7?gd*qkHIhjSP*r2-$buS{og=BY>#yxY|AOacF~c z?sNz*L7cH8SM)$wkxP0KlxqzTU)o+<(~GdC(RIJO&b@%=qWsrtft^-Uvmv0j4o)PH z4gZS}_!Qq!G;X;mRCjz%5QPyGqu9va`Ibe!4sdqnp%|n@?YOO3eu_TdLRg7!r#Cqh zgZ;~?->eNTS1D=dWAG`_A?Py3?JK5r z+bJ`7?Eqfl-Gl_GksDt6{(dp5ZW-qi<^}px;;RaT$v*t#R%C={0%WxP*UV;%p+bdj z_~DfufUIq*B;ikeI06C0dTNT4M3i@@<-3uV!3gK0ib%^41gb`CBxpStfn0({u7@C2 z%CQMPyn>z;H8H5ZaZvN~Vo-hUfTz)hU-k+*q~S+Uh6W{c&Z3@qsR3aa$BewvSR1YN z{t()iMTCD8-TTk8t2_^1?JZee*&T~Hy(nWfaweh93wyHnRC^XwF464afXVMZJ6kb1 z0oOvyv7D*UYV>T~2T>N8fM*e8x$ZI3GffGB?lUT_NUTF4g%0v5LA{QudADE7Mi(lI z^WqoD&SI&&tuU=zb5EPHsvqV}o4c$M)nhbpU2?dmk^cN(Z4-;RQ^Rk>I3^JI8fZuW z_f*xN-!ylcLl+P6rzEfh>q5 z*?;UL|BnmwNN;TIUPZB`mmXux&zzMUj%)t7$ooI?{YNTt>jA@jP$1cVO_Kcl32|l0 zq-T5R-s=B2^grJGk7NIl)hC9^rC?8_KdxC_C%$f-Lo=lR?+J0mb)9Fs9IHn)l}q9< zHE_VN_;o+xgm^VR&)~U}Z{S&1usu8EGo{Z5qI>KLiq>ZJ<<3Mxy&Q!Jo zKy}mDhIN5*ne_v299GYEDwnz_3YP)HYHF(g`24YGokN%Fe{}gDhX$S#uFCx%_tuf# z$}{=@V=TeJvqt`p9sgs||2T=|+0Ho3HyPI~dy#230Mr&CKzheM|J)}lW>VDZUPuMe zSQMI!n=7Zz`L9>u!*j-|wn@+SMW)pNP*WuNz+1&(n?cMZxz+vI{=6tO6gO8)o%3I( z!iRq+nJKpQ&-O*88r+Qcd|_%TxQ$T zxn0hXL=6>bfpDWnudfkOjYUTD?eq@+62?$5`=-fu#_3yVYLuNteHs05YgdQYkJqnX z@9kH@-Z*R1+ePqbe0&r}gKMbtEs;aYf`(Js6ysKOQb@dNNT;bIX8eWaW^G%qGbl%! z1MIQe#U-|5mNJ(8Z#k{(?R`;wWJNg=w}UZR;f(RDbE#%~ymzzD8=vL9zJ~RPQ${IG z;@vu=KEuEK-jKqa(mbteV6Z&r+`z?W>hvf8soOyQTTCF&gxTMBMgQhX{`_hENyUiz zZaHK56x6!~>VJZr-k3T)tf#rxf%uHlY)4El2}DY6|LP{+bV-GX)fq~XaSRxT-cK_5 z2ObrEzP8M^Eg2^0n?+q;qbo02dwTG_Ter(a<3!S~C*g_s$hwMil0|0?(Afrod7cPh zi*9H%oR4El2~yk2wm%MzOO13`+fLYOpS&up?NHev+9IUMdLlTWM>(vV@!X>~C{jl`ES?q4sKB6*PzKPfCa9%v zl*7iE$2~g3aC8BGD~-GPM+@U9hj~q6i~JUO2GHtRFl}Z21X|QYK8rNo=9Cst$tZ`l zGmHDkPs9EN-mNsA=9m_nt;`IdO-;tL0PIjgvrTPJfs9?_YjdoD;4M9dRjt4zzdY)M z2C@$AVNwO1ZomrZiq*;&Gl{P(8Oz`C#b30maIpRR;+N8RXt^M-6Lt*k=7_0qXiLoK zOAA}jqbfZe_V>s-`5el<=?{9^&@NJ{)D~P<_u%qHnrByc$}Q)0%ZhH8yq}`IdV&2; zh^oUa#oKT%VFzu`4A9A{wLdMX*R~681XTv`|GHkT96LFxEMkwRUg5b+9FDfWXW{Mp zwUEf4KSNrR8=2vJQ2NongU4hj`Q3V|IMK7P^`7>Y)gzy$(z9_k2T>Y&NLhMZO!qs6 z)`@MDrCo^%>iGA@i1YCn4t?-`4pDv%*$#A1v<-RwC6Qqsoe`$P&wL}U)-FN`n_gO4 zBr`qC*&~H)V8xs$Nir@d(DOx6nwAs1z7xBgRIt{GTa1fV3ga7RrrFmoa=&x$8;V25 z#Z?M8Hni;F4;X;XZN>vFX&maaR4Kf>EQOHDK0h9WtR;8tv_6!G?|Z}QB#{CG^5Yy+ zEs+hwU!ApT_WYqL97o2(F{3k^ap9G$+38~Po0v;l0;wwdli0mcCtXD{R#h&uaQ z;A14YOY+UmZ8jpO*>yqMWGl2a2# zwJfAga?okxzyB-$6Bp#9J_tuhQrXyLWk_wxcH}mtTRN$}{+W;&%JL#?8wVDY__m?`wpSI4f=Cp+4kp zxg2t1GNfe@BOZlo_7p@$r54liV}V+3Jg@LVi??f^;a>U}!`w%m&%*tkVEF12HyyP+ z)m!?S>4fds&hX8v+Hd5i2bt6F{K{xyH6pQg+)1-n5vLM`{_)J|MM*GiKoo_h$nI(D_QVv5rP)mB?ZWB<|nM86A2L?5iw|)nJ2g$QvIf zn*>_e#G7E4beK39ALddRefa92x%jQB%<@T?_z53%zyQT*FUZ!Oq6gRbyN555gWOSYxZQ_pO19GtCJlOu-i6V$o zYyVvZRa_`v=W@O-k)zh0#|kp;+3GtM<)6ExW*_6IWva(zdqb3VNF53@kIk%0jk0;nJQitA`)2g+n zinb{X_+6QMn(%%}0U2{nCgja`*neT`?70ilAj~S6!tq&R8&Hf3h{%v^FMQs6%RcZI z-#g@H4TXBHtlw8Mno1UOG+FgLip8Db0YS7dRU*<;etpyM7PpNI?lPHiUbHZA0%BxB z0JJ;d!=LfOBX1H8?v0z;momAyez{(Qcp932){7i+>U}ps2WRB-gYK4=*=~nB`#%%h z=;mX-h@{pzu9V5sSul!j_|$(3&!%^y)E|1AkwY0is+wV`IuoKH@^(mYfYx2;A1(cu z>tKVm$XlQB>QUF+tB`WQK;s&us9)IX+p~EIj46V>FwoEpABwX`!{~W>e@(NI;Gw_e z&E)X${A)N!+eZBMt=r(4Z3tz(MHwyJJ6zj7K_*v~Vk6fthoKnG^s;Xy@&&i!iznN6-xtiVX z*y7Fk&^}sNA@scxc44FN1}Td>zpMZ+7pxqbZvg^M0C9Z5(hz|iXg}?MV#a!G`Q1;v zJAvBxmHnqYOS)_FYi3JI5ledJL^?7p<}{uhe9{KyP@ZsJ(ubMoy6>l?BNNR@cl~Ej z=pgj`^%=c>+%~W~&vFC8v`9<=(+j49{qW}nY@?*VoGWypxXnc!!8Y^Z*%+a93ETAO z#?LYXQ5+lvk9E|x(17Dn@-PmQouxTJRtH7BWu~*W3nXqqe|Eq5X#gs6EV~ z9b1Z~8&;Me74HAewM%;8XmynvFqEKMMhnIZYm}#$BDalrl9jnHBVChPeD`D!W|eBG znELw7iTX=i>tk-rFE~F}&E)@VGaOHM=V1m4UW@i-#>3GY1q+~PU|@G+@V^&Z{(oI$ zozrQXRR*0X#2fzvemHOmeaNZp0%2U@_H1eV{nouD!p#-rgEQJ@Ci!9-YfJ0;hBB~I zdjHDq0S_ELx##xUy-q6*GLmC4y_zx$o%6|%b#+b?aWi3a-)IjyQQ02X$LQGhr-$dO zY7H_!wgZM*SNpt#z*&gLCV6!LhE| z2+#fsd%q1s412YnCoTSPSFUAxnplzU`ze0S-)zuaNKV6h+XjC*0L}&=&8u{lZz)|6 zW7M}(Du5CBV!5Xt!vhZ_kyH96F_pId&vy*&e`XG}bDwI$jc{9V+$c7X3C%J~sQ;(2 zuZoJRSsKM%g1fsr1P?Y4+&#EMLXhAvxVr{-cXxLN_uxT-yZfDd=a+NVy$^S0RqyUz zjq%roGe90EO2*)uUV7x+MzeFz&zbj10p*jN3ZBoE0xdfz_ z$KADy!e`snjT#xI!6|`PLodRSC;G|DernVd@C(fXeOEXZ{gViUPAkSbi(|pF>=P#o zkv#9uuJMnvw!QQI1pV@=Px$wmNCis))$rXA-m5(geytGR&0yj`yzHJmCy>`dTv&7H zzWfk>kS+ccGojaAkuyyt%_nE=^#aSFvr)U)u9pgze5+v%k$q6E(F>ORbb7Az4l85X zj2>5STt=E}PbLn0UxYw91cvNrCW#IzffsQYTC+EiBM8QIJvZhSK129J*PKT^%to!k z`8Zdw%$q3=L_1srBt}`5kDZZar1$~tu1^u!i7ziD}dTsO&Zm}DYd`GLn zX(3%kTZ8mM`b#0hae*=pbqBWy5dwMa>*QP6bKB#xg=PeQ!C*vpfki&pC(4ezOr#A> z3|9d?3E2d-1ik7f=t~0ZDfZ3mQSzNfefv-5%V;MME>H|;q`o{o0!BH0Bl-VrL*nYYWs}4(6D#ih#9$OkyC#@cT<4SkrH(@QLZKr5)tIWy?Sv zQI{3+vVk=JYgXo`BQ&6=(Z6{k5#~RKD4zdFMl8Sbh~!`h0@2O#FdjcmE{1xMgHcn_9EEpzN51}zWwci4E7GV? zv`1fnq>_|AxW^CFqnh-MwWV148_7tm3RH{`?(KkG2=^Fp1IF8p4L%@@g9b|;fplcq z^%%L0)uU*(mPCtfwjFpxyCMb0JDIQiVQ2}41BIon|D2jldwea*6s0JL1Vr2@mF1F25TaMobRo zh8Anf1D?A5s{t=q127u6A^qDxj+D_k9{j)1KH`$whk#R&bR;tt-D*H~MBMqW@=aia zS~aN_DZoa2ja?-N`=biO6d2MWP37q8^@+-H1n}>8j=uj@1;DBOSBHP;#!VSw5LyMc z4eVaxzwXulRJ9b^>bq8i;RNX}2u{`ePiKLDxgA9Puiq;FiZ%d?0i*Hwb$p?+f%@xT zXs~~Qy9ojE+>~S^zX;>d!8M={W$H0}<8%4nGVr$s{UaUguXHSM$)HRS84;u6^vkHk zNc~i`5Q+oUN(x5e1y`ScnXEP$lo3IN4fYO?`$Z`R4|q-gm1nz~V&(BRFO*A=dVZ%p zXhw9gPiHy92{yo|KFt5l#YDEBuoaMt|APTl1HTAy?0f1*a$~CszpF@&(}SrET>;&M zdy=!Vi#C$^iSggU8Oc@ImJ_G