From 640a7ed8859aa0d9be4ca9b8e6d488687ee912a8 Mon Sep 17 00:00:00 2001 From: Zheng Date: Mon, 13 Nov 2023 20:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D=E7=A9=BA?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateUpdateBaseDto.cs | 8 + .../AppBase/Filters/Condition.cs | 8 + .../AppBase/Filters/EnumFilterAction.cs | 62 ++ .../AppBase/Filters/EnumFilterLogic.cs | 17 + .../AppBase/Filters/Filter.cs | 40 + .../AppBase/Filters/FilterExtensions.cs | 371 +++++++++ .../AppBase/ISfsRequest.cs | 12 + .../AppBase/IZbxBase.cs | 24 + .../AppBase/SfsRequestInputBase.cs | 12 + .../AllTableColumnTypeDto.cs | 22 + .../AppBase/TableColumnTypeDto/ColumnType.cs | 31 + .../CreateUpdateExportCustomUserSettingDto.cs | 33 + .../Dtos/ExportCustomUserSettingDto.cs | 38 + .../ExportCustomUserSettingGetListInput.cs | 36 + .../IExportCustomUserSettingAppService.cs | 26 + .../WmsPermissionDefinitionProvider.cs | 31 +- .../Permissions/WmsPermissions.cs | 33 +- ...n.FasterZ.Wms.Application.Contracts.csproj | 1 + .../WmsApplicationContractsModule.cs | 31 +- .../WmsDtoExtensions.cs | 17 +- .../Dtos/AuthDepartmentGetListInput.cs | 21 +- .../Dtos/CreateUpdateAuthDepartmentDto.cs | 21 +- .../IAuthDepartmentAppService.cs | 20 +- .../Extensions/ExpressionExtensions.cs | 27 + .../Extensions/ObjectExpressionExtensions.cs | 54 ++ .../Extensions/ObjectMapperExtensions.cs | 119 +++ .../AppBase/Extensions/StringExtensions.cs | 17 + .../AppBase/ZbxBase.cs | 711 ++++++++++++++++++ .../ExportCustomUserSettingAppService.cs | 63 ++ .../WinIn.FasterZ.Wms.Application.csproj | 2 + .../WmsAppService.cs | 15 +- .../WmsApplicationAutoMapperProfile.cs | 19 +- .../WmsApplicationModule.cs | 35 +- .../AuthDepartmentAppService.cs | 8 +- .../Pages/Index.cshtml.cs | 37 +- .../WinIn.FasterZ.Wms.AuthServer/Program.cs | 71 +- .../WmsAuthServerModule.cs | 253 +++---- .../WmsBrandingProvider.cs | 11 +- .../DbMigratorHostedService.cs | 65 +- .../WinIn.FasterZ.Wms.DbMigrator/Program.cs | 43 +- .../WmsDbMigratorModule.cs | 23 +- .../Enums/Enum_ExportCustomUserSetting.cs | 14 + .../Localization/WmsResource.cs | 9 +- .../MultiTenancy/MultiTenancyConsts.cs | 17 +- .../WmsDomainErrorCodes.cs | 9 +- .../WmsDomainSharedModule.cs | 69 +- .../WmsModuleExtensionConfigurator.cs | 109 +-- .../ExportCustomUserSetting.cs | 43 ++ .../IExportCustomUserSettingRepository.cs | 12 + .../Data/IWmsDbSchemaMigrator.cs | 9 +- .../Data/NullWmsDbSchemaMigrator.cs | 17 +- .../Data/WmsDbMigrationService.cs | 289 +++---- .../OpenIddictDataSeedContributor.cs | 647 ++++++++-------- .../Settings/WmsSettingDefinitionProvider.cs | 13 +- .../src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs | 11 +- .../WmsDomainModule.cs | 85 +-- .../AuthDepartment/AuthDepartment.cs | 23 +- .../IAuthDepartmentRepository.cs | 13 +- .../Z_Business/AuthMenu/AuthMenu.cs | 43 +- .../Z_Business/AuthUserMenu/AuthUserMenu.cs | 19 +- .../AuthUserWorkGroup/AuthUserWorkGroup.cs | 17 +- .../Z_Business/BasedataAql/BasedataAql.cs | 31 +- .../Z_Business/BasedataArea/BasedataArea.cs | 27 +- .../Z_Business/BasedataBom/BasedataBom.cs | 39 +- .../BasedataCalendar/BasedataCalendar.cs | 23 +- .../BasedataCategory/BasedataCategory.cs | 21 +- .../BasedataCurrency/BasedataCurrency.cs | 23 +- .../BasedataCurrencyExchange.cs | 25 +- .../BasedataCustomer/BasedataCustomer.cs | 41 +- .../BasedataCustomerAddress.cs | 33 +- .../BasedataCustomerItem.cs | 31 +- .../Z_Business/BasedataDict/BasedataDict.cs | 27 +- .../BasedataDictItem/BasedataDictItem.cs | 31 +- .../Z_Business/BasedataDock/BasedataDock.cs | 25 +- .../BasedataDocumentSetting.cs | 31 +- .../BasedataErpLocation.cs | 25 +- .../BasedataInterfaceCalendar.cs | 31 +- .../BasedataItemCategory.cs | 21 +- .../BasedataItemGuideBook.cs | 27 +- .../BasedataItemPack/BasedataItemPack.cs | 27 +- .../BasedataItemQuality.cs | 25 +- .../BasedataItemSafetyStock.cs | 35 +- .../BasedataItemStoreRelation.cs | 39 +- .../BasedataLocation/BasedataLocation.cs | 77 +- .../BasedataLocationGroup.cs | 65 +- .../BasedataMachine/BasedataMachine.cs | 27 +- .../BasedataProductionLine.cs | 31 +- .../BasedataProductionLineItem.cs | 19 +- .../BasedataProject/BasedataProject.cs | 27 +- .../BasedataPurchasePriceSheet.cs | 25 +- .../BasedataSalePriceSheet.cs | 25 +- .../Z_Business/BasedataShift/BasedataShift.cs | 27 +- .../BasedataStdCostPriceSheet.cs | 25 +- .../BasedataSupplier/BasedataSupplier.cs | 45 +- .../BasedataSupplierItem.cs | 33 +- .../BasedataSupplierTimeWindow.cs | 23 +- .../Z_Business/BasedataTeam/BasedataTeam.cs | 23 +- .../BasedataTransactionType.cs | 49 +- .../Z_Business/BasedataUom/BasedataUom.cs | 23 +- .../BasedataWarehouse/BasedataWarehouse.cs | 21 +- .../BasedataWorkGroup/BasedataWorkGroup.cs | 23 +- .../BasedataWorkShop/BasedataWorkShop.cs | 21 +- .../BasedataWorkStation.cs | 29 +- .../FileStorageDataExportTask.cs | 33 +- .../FileStorageDataImportTask.cs | 37 +- .../FileStorageFile/FileStorageFile.cs | 21 +- .../InventoryBalance/InventoryBalance.cs | 73 +- .../InventoryBalanceCopy.cs | 73 +- .../InventoryContainer/InventoryContainer.cs | 45 +- .../InventoryContainerDetail.cs | 61 +- .../InventoryErpBalance.cs | 27 +- .../InventoryExpectIn/InventoryExpectIn.cs | 57 +- .../InventoryExpectOut/InventoryExpectOut.cs | 57 +- .../InventoryLocationCapacity.cs | 25 +- .../InventorySnapshot/InventorySnapshot.cs | 61 +- .../InventoryTransaction.cs | 75 +- .../InventoryTransferLog.cs | 93 +-- .../Z_Business/JobCheckJob/JobCheckJob.cs | 57 +- .../JobCheckJobDetail/JobCheckJobDetail.cs | 67 +- .../Z_Business/JobCountJob/JobCountJob.cs | 69 +- .../JobCountJobDetail/JobCountJobDetail.cs | 75 +- .../Z_Business/JobDeliverJob/JobDeliverJob.cs | 67 +- .../JobDeliverJobDetail.cs | 101 +-- .../Z_Business/JobInspectJob/JobInspectJob.cs | 79 +- .../JobInspectJobDetail.cs | 97 +-- .../JobInspectJobSummaryDetail.cs | 75 +- .../Z_Business/JobIssueJob/JobIssueJob.cs | 65 +- .../JobIssueJobDetail/JobIssueJobDetail.cs | 123 +-- .../JobJisDeliverJob/JobJisDeliverJob.cs | 75 +- .../JobJisDeliverJobDetail.cs | 53 +- .../JobProductReceiveJob.cs | 63 +- .../JobProductReceiveJobDetail.cs | 93 +-- .../JobProductionReturnJob.cs | 59 +- .../JobProductionReturnJobDetail.cs | 99 +-- .../JobPurchaseReceiptJobCopy.cs | 69 +- .../JobPurchaseReceiptJobDetail.cs | 107 +-- .../JobPurchaseReceiptJobDetailCopy.cs | 107 +-- .../JobPurchaseReturnJob.cs | 73 +- .../JobPurchaseReturnJobDetail.cs | 95 +-- .../Z_Business/JobPutawayJob/JobPutawayJob.cs | 77 +- .../JobPutawayJobDetail.cs | 105 +-- .../JobUnplannedIssueJob.cs | 65 +- .../JobUnplannedIssueJobDetail.cs | 97 +-- .../JobUnplannedReceiptJob.cs | 65 +- .../JobUnplannedReceiptJobDetail.cs | 97 +-- .../LabelCountLabel/LabelCountLabel.cs | 19 +- .../LabelInventoryLabel.cs | 83 +- .../LabelLabelDefinition.cs | 31 +- .../LabelPalletCode/LabelPalletCode.cs | 19 +- .../LabelPalletLabel/LabelPalletLabel.cs | 31 +- .../LabelSaleLabel/LabelSaleLabel.cs | 57 +- .../LabelSerialCode/LabelSerialCode.cs | 19 +- .../MessageAnnouncement.cs | 27 +- .../MessageMessageType/MessageMessageType.cs | 27 +- .../MessageMessageTypeSubscribe.cs | 21 +- .../MessageNotifyMessage.cs | 25 +- .../MessagePrivateMessage.cs | 35 +- .../MessageUserNotifyMessage.cs | 37 +- .../StoreBackFlushNote/StoreBackFlushNote.cs | 79 +- .../StoreBackFlushNoteDetail.cs | 67 +- .../StoreContainerBindNote.cs | 37 +- .../StoreContainerBindNoteDetail.cs | 51 +- .../StoreCountAdjustNote.cs | 41 +- .../StoreCountAdjustNoteDetail.cs | 73 +- .../StoreCountAdjustRequest.cs | 45 +- .../StoreCountAdjustRequestDetail.cs | 69 +- .../StoreCountNote/StoreCountNote.cs | 49 +- .../StoreCountNoteCopy/StoreCountNoteCopy.cs | 35 +- .../StoreCountNoteDetail.cs | 99 +-- .../StoreCountNoteDetailCopy.cs | 99 +-- .../StoreCountPlan/StoreCountPlan.cs | 63 +- .../StoreCountPlanDetail.cs | 95 +-- .../StoreCustomerAsn/StoreCustomerAsn.cs | 47 +- .../StoreCustomerAsnDetail.cs | 41 +- .../StoreCustomerReturnNote.cs | 35 +- .../StoreCustomerReturnNoteDetail.cs | 81 +- .../StoreDeliverNote/StoreDeliverNote.cs | 45 +- .../StoreDeliverNoteDetail.cs | 133 ++-- .../StoreDeliverPlan/StoreDeliverPlan.cs | 53 +- .../StoreDeliverPlanDetail.cs | 41 +- .../StoreDeliverRequest.cs | 51 +- .../StoreDeliverRequestDetail.cs | 39 +- .../StoreExchangeDatum/StoreExchangeDatum.cs | 49 +- .../StoreInspectAbnormalNote.cs | 35 +- .../StoreInspectAbnormalNoteDetail.cs | 55 +- .../StoreInspectNote/StoreInspectNote.cs | 53 +- .../StoreInspectNoteDetail.cs | 101 +-- .../StoreInspectNoteSummaryDetail.cs | 73 +- .../StoreInspectRequest.cs | 61 +- .../StoreInspectRequestDetail.cs | 79 +- .../StoreInspectRequestSummaryDetail.cs | 71 +- .../StoreInventoryInitialNote.cs | 31 +- .../StoreInventoryInitialNoteDetail.cs | 63 +- .../StoreInventoryTransferNote.cs | 35 +- .../StoreInventoryTransferNoteDetail.cs | 83 +- .../StoreIsolationNote/StoreIsolationNote.cs | 31 +- .../StoreIsolationNoteDetail.cs | 81 +- .../StoreIssueNote/StoreIssueNote.cs | 43 +- .../StoreIssueNoteDetail.cs | 143 ++-- .../StoreItemTransformNote.cs | 33 +- .../StoreItemTransformNoteDetail.cs | 99 +-- .../StoreItemTransformRequest.cs | 41 +- .../StoreItemTransformRequestDetail.cs | 99 +-- .../StoreJisDeliverNote.cs | 47 +- .../StoreJisDeliverNoteDetail.cs | 103 +-- .../StoreJisProductReceiptNote.cs | 55 +- .../StoreJisProductReceiptNoteDetail.cs | 79 +- .../StoreMaterialRequest.cs | 51 +- .../StoreMaterialRequestDetail.cs | 61 +- .../StoreNoOkConvertOkNote.cs | 29 +- .../StoreNoOkConvertOkNoteDetail.cs | 81 +- .../StoreOfflineSettlementNote.cs | 33 +- .../StoreOfflineSettlementNoteDetail.cs | 63 +- .../StorePreparationPlan.cs | 45 +- .../StorePreparationPlanDetail.cs | 45 +- .../StoreProductL7partsNote.cs | 51 +- .../StoreProductL7partsNoteDetail.cs | 61 +- .../StoreProductReceiptNote.cs | 49 +- .../StoreProductReceiptNoteDetail.cs | 125 +-- .../StoreProductReceiptRequest.cs | 55 +- .../StoreProductReceiptRequestDetail.cs | 63 +- .../StoreProductRecycleMaterialDetail.cs | 77 +- .../StoreProductRecycleNote.cs | 43 +- .../StoreProductRecycleNoteDetail.cs | 65 +- .../StoreProductRecycleRequest.cs | 45 +- .../StoreProductRecycleRequestDetail.cs | 59 +- .../StoreProductionPlan.cs | 53 +- .../StoreProductionPlanDetail.cs | 53 +- .../StoreProductionReturnNote.cs | 35 +- .../StoreProductionReturnNoteDetail.cs | 133 ++-- .../StoreProductionReturnRequest.cs | 41 +- .../StoreProductionReturnRequestDetail.cs | 81 +- .../StorePurchaseOrder/StorePurchaseOrder.cs | 55 +- .../StorePurchaseOrderDetail.cs | 75 +- .../StorePurchaseReceiptNote.cs | 53 +- .../StorePurchaseReceiptNoteDetail.cs | 131 ++-- .../StorePurchaseReceiptRequest.cs | 61 +- .../StorePurchaseReceiptRequestDetail.cs | 63 +- .../StorePurchaseReturnNote.cs | 49 +- .../StorePurchaseReturnNoteDetail.cs | 121 +-- .../StorePurchaseReturnRequest.cs | 53 +- .../StorePurchaseReturnRequestDetail.cs | 67 +- .../StorePutawayNote/StorePutawayNote.cs | 47 +- .../StorePutawayNoteDetail.cs | 139 ++-- .../StorePutawayRequest.cs | 63 +- .../StorePutawayRequestDetail.cs | 87 +-- .../StoreReceiptAbnormalNote.cs | 35 +- .../StoreReceiptAbnormalNoteDetail.cs | 69 +- .../StoreRecycledMaterialReceiptNote.cs | 35 +- .../StoreRecycledMaterialReceiptNoteDetail.cs | 65 +- .../StoreSaleOrder/StoreSaleOrder.cs | 49 +- .../StoreSaleOrderDetail.cs | 47 +- .../StoreScrapNote/StoreScrapNote.cs | 35 +- .../StoreScrapNoteDetail.cs | 83 +- .../StoreScrapRequest/StoreScrapRequest.cs | 43 +- .../StoreScrapRequestDetail.cs | 49 +- .../StoreSupplierAsn/StoreSupplierAsn.cs | 65 +- .../StoreSupplierAsnDetail.cs | 69 +- .../StoreTransferNote/StoreTransferNote.cs | 47 +- .../StoreTransferNoteCopy.cs | 33 +- .../StoreTransferNoteDetail.cs | 85 +-- .../StoreTransferNoteDetailCopy.cs | 85 +-- .../StoreTransferRequest.cs | 45 +- .../StoreTransferRequestDetail.cs | 83 +- .../StoreUnplannedIssueNote.cs | 39 +- .../StoreUnplannedIssueNoteDetail.cs | 123 +-- .../StoreUnplannedIssueRequest.cs | 47 +- .../StoreUnplannedIssueRequestDetail.cs | 71 +- .../StoreUnplannedReceiptNote.cs | 39 +- .../StoreUnplannedReceiptNoteDetail.cs | 123 +-- .../StoreUnplannedReceiptRequest.cs | 47 +- .../StoreUnplannedReceiptRequestDetail.cs | 71 +- .../StoreWarehouseTransferNote.cs | 33 +- .../StoreWarehouseTransferNoteDetail.cs | 83 +- .../StoreWipWarehouseAdjustNote.cs | 39 +- .../StoreWipWarehouseAdjustNoteDetail.cs | 85 +-- .../StoreWipWarehouseAdjustRequest.cs | 41 +- .../StoreWipWarehouseAdjustRequestDetail.cs | 85 +-- .../StoreWorkOrder/StoreWorkOrder.cs | 55 +- .../StoreWorkOrderDetail.cs | 41 +- .../EntityFrameworkCoreWmsDbSchemaMigrator.cs | 43 +- .../EntityFrameworkCore/WmsDbContext.cs | 137 ++-- .../WmsDbContextFactory.cs | 37 +- .../WmsEfCoreEntityExtensionMappings.cs | 21 +- .../WmsEntityFrameworkCoreModule.cs | 57 +- ...AuthDepartmentEfCoreQueryableExtensions.cs | 21 +- .../AuthDepartmentRepository.cs | 17 +- .../WmsHttpApiClientModule.cs | 45 +- .../Controllers/HomeController.cs | 11 +- .../WinIn.FasterZ.Wms.HttpApi.Host/Program.cs | 71 +- .../WmsHttpApiHostModule.cs | 323 ++++---- .../Controllers/WmsController.cs | 15 +- .../Models/Test/TestModel.cs | 11 +- .../WmsHttpApiModule.cs | 49 +- .../LoginLink/LoginLinkViewComponent.cs | 11 +- .../Controllers/AccountController.cs | 7 +- .../Menus/WmsMenuContributor.cs | 109 +-- .../WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs | 15 +- .../Menus/WmsToolbarContributor.cs | 25 +- .../Pages/Index.cshtml.cs | 17 +- .../Pages/WmsPageModel.cs | 11 +- .../AuthDepartment/CreateModal.cshtml.cs | 31 +- .../AuthDepartment/EditModal.cshtml.cs | 47 +- .../AuthDepartment/Index.cshtml.cs | 57 +- .../WmsBrandingProvider.cs | 11 +- .../WmsWebAutoMapperProfile.cs | 15 +- .../src/WinIn.FasterZ.Wms.Web/WmsWebModule.cs | 371 ++++----- 307 files changed, 10033 insertions(+), 7943 deletions(-) create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/CreateUpdateBaseDto/CreateUpdateBaseDto.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterAction.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterLogic.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Filter.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/FilterExtensions.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/AllTableColumnTypeDto.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/ColumnType.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/CreateUpdateExportCustomUserSettingDto.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingDto.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingGetListInput.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ExpressionExtensions.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectExpressionExtensions.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectMapperExtensions.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/StringExtensions.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Enums/Enum_ExportCustomUserSetting.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs create mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/CreateUpdateBaseDto/CreateUpdateBaseDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/CreateUpdateBaseDto/CreateUpdateBaseDto.cs new file mode 100644 index 000000000..1faabdf82 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/CreateUpdateBaseDto/CreateUpdateBaseDto.cs @@ -0,0 +1,8 @@ +using System; +using Volo.Abp.Application.Dtos; + +namespace WinIn.FasterZ.Wms.AppBase.CreateUpdateBaseDto; + +public class CreateUpdateBaseDto : EntityDto +{ +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs new file mode 100644 index 000000000..f65ed755a --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; + +namespace WinIn.FasterZ.Store.AppBase.Filters; + +public class Condition +{ + public ICollection Filters { get; set; } = new List(); +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterAction.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterAction.cs new file mode 100644 index 000000000..1f5cd3961 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterAction.cs @@ -0,0 +1,62 @@ +using System.ComponentModel; + +namespace WinIn.FasterZ.Wms.AppBase.Filters; + +/// +/// 过滤条件 +/// +public enum EnumFilterAction +{ + /// + /// equal + /// + [Description("等于")] Equal = 0, + + /// + /// Not equal + /// + [Description("不等于")] NotEqual = 1, + + /// + /// Bigger + /// + [Description("大于")] BiggerThan = 2, + + /// + /// Smaller + /// + [Description("小于")] SmallThan = 3, + + /// + /// Bigger or equal + /// + [Description("大于等于")] BiggerThanOrEqual = 4, + + /// + /// Small or equal + /// + [Description("小于等于")] SmallThanOrEqual = 5, + + /// + /// Like + /// + [Description("类似于")] Like = 6, + + /// + /// Not like + /// + [Description("不类似于")] NotLike = 7, + + /// + /// Contained in + /// List items = new List(); + /// string value = JsonSerializer.Serialize(items);//转成Json字符串 + /// FilterCondition filterCondition = new FilterCondition() { Column = "Name", Value = value, Action = EnumFilterAction.In, Logic = EnumFilterLogic.And }; + /// + [Description("包含于")] In = 8, + + /// + /// Not contained in + /// + [Description("不包含于")] NotIn = 9, +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterLogic.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterLogic.cs new file mode 100644 index 000000000..d90c37719 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/EnumFilterLogic.cs @@ -0,0 +1,17 @@ +namespace WinIn.FasterZ.Wms.AppBase.Filters; + +/// +/// 过滤逻辑 +/// +public enum EnumFilterLogic +{ + /// + /// 与 + /// + And = 0, + + /// + /// 或 + /// + Or = 1 +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Filter.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Filter.cs new file mode 100644 index 000000000..6d9403976 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Filter.cs @@ -0,0 +1,40 @@ +namespace WinIn.FasterZ.Wms.AppBase.Filters; + +public class Filter +{ + public Filter() + { + Logic = "And"; + } + + public Filter(string column, string value, + string action = "==", + string logic = "And") + { + Column = column; + Action = action; + Value = value; + Logic = logic; + } + + /// + /// 过滤条件之间的逻辑关系:AND和OR + /// + public string? Logic { get; set; } = "And"; + + /// + /// 过滤条件中使用的数据列 + /// + public string? Column { get; set; } + + /// + /// 过滤条件中的操作:==,!=,>,<,>=,<=,In,NotIn,Like,NotLike + /// Equal、NotEqual、BiggerThan、SmallThan、BiggerThanOrEqual、SmallThanOrEqual、In、NotIn + /// + public string? Action { get; set; } = "=="; + + /// + /// 过滤条件中的操作的值 + /// + public string? Value { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/FilterExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/FilterExtensions.cs new file mode 100644 index 000000000..a52aecd8e --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/FilterExtensions.cs @@ -0,0 +1,371 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Linq.Expressions; +using System.Text.Json; +using Volo.Abp; +using WinIn.FasterZ.Wms.AppBase.Filters; + +namespace WinIn.FasterZ.Store.AppBase.Filters; + +public static class FilterExtensions +{ + public static Expression> ToLambda(this string jsonFilter) + { + if (string.IsNullOrWhiteSpace(jsonFilter)) + { + return p => true; + } + + var filterConditions = JsonSerializer.Deserialize>(jsonFilter); + return filterConditions.ToLambda(); + } + + public static Expression> ToLambda(this Filter filter) + { + var filterConditions = new List { filter }; + return filterConditions.ToLambda(); + } + + public static Expression> ToLambda(this ICollection filterConditionList) + { + Expression> condition = null; + try + { + if (!filterConditionList.Any()) + { + //创建默认表达式 + return p => true; + } + + foreach (var filterCondition in filterConditionList) + { + var tempCondition = CreateLambda(filterCondition); + if (condition == null) + { + condition = tempCondition; + } + else + { + condition = filterCondition.Logic switch + { + "And" => condition.And(tempCondition), + "Or" => condition.Or(tempCondition), + _ => condition + }; + } + } + } + catch (Exception ex) + { + throw new Exception($"获取筛选条件异常:{ex.Message}"); + } + + return condition; + } + + private static Expression> CreateLambda(Filter filter) + { + Expression> expression = p => false; + try + { + var parameter = Expression.Parameter(typeof(T), "p"); //创建参数p + var member = Expression.PropertyOrField(parameter, filter.Column); //创建表达式中的属性或字段 + + ConstantExpression constant = null; + //var propertyType = member.Type; //取属性类型,常量constant按此类型进行转换 + //constant = Expression.Constant(filterCondition.Value);//创建常数 + + if (filter.Action != "In" && filter.Action != "NotIn") + { + constant = CreateConstantExpression(member.Type, filter.Value); + } + + switch (filter.Action.ToLower()) + { + case "==": + expression = Expression.Lambda>(Expression.Equal(member, constant), parameter); + break; + + case "!=": + expression = Expression.Lambda>(Expression.NotEqual(member, constant), parameter); + break; + + case ">": + expression = Expression.Lambda>(Expression.GreaterThan(member, constant), parameter); + break; + + case "<": + expression = Expression.Lambda>(Expression.LessThan(member, constant), parameter); + break; + + case ">=": + expression = + Expression.Lambda>(Expression.GreaterThanOrEqual(member, constant), parameter); + break; + + case "<=": + expression = + Expression.Lambda>(Expression.LessThanOrEqual(member, constant), parameter); + break; + + case "like": + expression = GetExpressionLikeMethod("Contains", filter); + break; + + case "notlike": + expression = GetExpressionNotLikeMethod("Contains", filter); + break; + + case "in": + expression = GetExpressionInMethod("Contains", member.Type, filter); + break; + + case "notin": + expression = GetExpressionNotInMethod("Contains", member.Type, filter); + break; + } + } + catch (Exception ex) + { + throw new UserFriendlyException(ex.Message); + } + + return expression; + } + + /// + /// + /// + /// + /// + private static ConstantExpression CreateConstantExpression(Type propertyType, string value) + { + ConstantExpression constant = null; + try + { + if (propertyType.IsGenericType && + propertyType.GetGenericTypeDefinition() == typeof(Nullable<>)) + { + + var objValue = Convert.ChangeType(ChangeTypeReturnValue(value, propertyType.GetGenericArguments()[0]), + propertyType.GetGenericArguments()[0], + CultureInfo.InvariantCulture); + + constant = Expression.Constant(objValue, propertyType); + } + else if (propertyType.IsEnum) + { + var enumValue = (Enum)Enum.Parse(propertyType, value, true); + constant = Expression.Constant(enumValue, propertyType); + } + else + { + constant = propertyType.Name switch + { + "Guid" => Expression.Constant(Guid.Parse(value)), + _ => Expression.Constant(Convert.ChangeType(value, propertyType, CultureInfo.InvariantCulture)) + }; + } + } + catch (Exception ex) + { + throw new Exception($"获取ConstantExpression异常:{ex.Message}"); + } + + return constant; + } + + private static Expression> GetExpressionLikeMethod(string methodName, Filter filter) + { + var parameterExpression = Expression.Parameter(typeof(T), "p"); + // MethodCallExpression methodExpression = GetMethodExpression(methodName, filterCondition.Column, filterCondition.Value, parameterExpression); + var methodExpression = GetMethodExpression(methodName, filter.Column, filter.Value, + parameterExpression); + return Expression.Lambda>(methodExpression, parameterExpression); + } + + private static Expression> GetExpressionNotLikeMethod(string methodName, Filter filter) + { + var parameterExpression = Expression.Parameter(typeof(T), "p"); + var methodExpression = GetMethodExpression(methodName, filter.Column, filter.Value, + parameterExpression); + var notMethodExpression = Expression.Not(methodExpression); + return Expression.Lambda>(notMethodExpression, parameterExpression); + } + + /// + /// 生成guidList.Contains(p=>p.GUId); + /// 除String类型,其他类型涉及到类型转换.如GUID + /// + /// + /// Contains + /// PropertyType/typeof(GUId) + /// PropertyName/PropertyValue + /// + private static Expression> GetExpressionInMethod(string methodName, Type propertyType, + Filter filter) + { + var parameterExpression = Expression.Parameter(typeof(T), "p"); + var lstType = typeof(List<>).MakeGenericType(propertyType); + + //转换枚举 + //if (propertyType.IsEnum) + //{ + // var valueArrayStrings = JsonSerializer.Deserialize>(filter.Value); + // List newValues = new List(); + + // var enumValues = propertyType.GetEnumValues(); + + // foreach (var valueArray in valueArrayStrings) + // { + // foreach (var enumValue in enumValues) + // { + // if (enumValue.ToString() == valueArray) + // { + // newValues.Add(enumValue); + // break; + // } + // } + // } + // var newValue = JsonSerializer.Serialize(newValues); + // filter.Value = newValue; + //} + + var propertyValue = JsonSerializer.Deserialize($"{filter.Value}", lstType); + if (propertyValue != null) + { + var methodExpression = GetListMethodExpression(methodName, propertyType, filter.Column, propertyValue, + parameterExpression); + var expression = Expression.Lambda>(methodExpression, parameterExpression); + return expression; + } + + return p => false; + } + + private static Expression> GetExpressionNotInMethod(string methodName, Type propertyType, + Filter filter) + { + var parameterExpression = Expression.Parameter(typeof(T), "p"); + var lstType = typeof(List<>).MakeGenericType(propertyType); + var propertyValue = JsonSerializer.Deserialize(filter.Value, lstType); + if (propertyValue != null) + { + var methodExpression = GetListMethodExpression(methodName, propertyType, filter.Column, propertyValue, + parameterExpression); + var notMethodExpression = Expression.Not(methodExpression); + return Expression.Lambda>(notMethodExpression, parameterExpression); + } + + return p => false; + } + + private static MethodCallExpression GetListMethodExpression(string methodName, Type propertyType, + string propertyName, object propertyValue, ParameterExpression parameterExpression) + { + var propertyExpression = Expression.Property(parameterExpression, propertyName); //p.GUID + var type = typeof(List<>).MakeGenericType(propertyType); + var method = type.GetMethod(methodName); //获取 List.Contains() + var someValue = Expression.Constant(propertyValue); //Value + return Expression.Call(someValue, method, propertyExpression); + } + + /// + /// 生成类似于p=>p.Code.Contains("xxx");的lambda表达式 + /// parameterExpression标识p，propertyName表示values，propertyValue表示"Code",methodName表示Contains + /// 仅处理p的属性类型为string这种情况 + /// + /// + /// + /// + /// + /// + private static MethodCallExpression GetMethodExpression(string methodName, string propertyName, + string propertyValue, ParameterExpression parameterExpression) + { + var propertyExpression = Expression.Property(parameterExpression, propertyName); + var method = typeof(string).GetMethod(methodName, new[] { typeof(string) }); + var someValue = Expression.Constant(propertyValue, typeof(string)); + return Expression.Call(propertyExpression, method, someValue); + } + + /// + /// 默认True条件 + /// + /// + /// + public static Expression> True() + { + return f => true; + } + + /// + /// 默认False条件 + /// + /// + /// + public static Expression> False() + { + return f => false; + } + + /// + /// 拼接 OR 条件 + /// + /// + /// + /// + /// + private static Expression> Or(this Expression> exp, + Expression> condition) + { + var inv = Expression.Invoke(condition, exp.Parameters); + return Expression.Lambda>(Expression.Or(exp.Body, inv), exp.Parameters); + } + + /// + /// 拼接And条件 + /// + /// + /// + /// + /// + private static Expression> And(this Expression> exp, + Expression> condition) + { + var inv = Expression.Invoke(condition, exp.Parameters); + return Expression.Lambda>(Expression.And(exp.Body, inv), exp.Parameters); + } + + /// + /// 转换传入的值，并将正确的值传出（解决 enum,guid） + /// + /// + /// + /// + public static object ChangeTypeReturnValue(object value, Type type) + { + if (value == null && type.IsGenericType) return Activator.CreateInstance(type); + if (value == null) return null; + if (type == value.GetType()) return value; + if (type.IsEnum) + { + if (value is string) + return Enum.Parse(type, value as string); + else + return Enum.ToObject(type, value); + } + if (!type.IsInterface && type.IsGenericType) + { + Type innerType = type.GetGenericArguments()[0]; + object innerValue = ChangeTypeReturnValue(value, innerType); + return Activator.CreateInstance(type, new object[] { innerValue }); + } + if (value is string && type == typeof(Guid)) return new Guid(value as string); + if (value is string && type == typeof(Version)) return new Version(value as string); + if (!(value is IConvertible)) return value; + return Convert.ChangeType(value, type); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs new file mode 100644 index 000000000..ed110b983 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs @@ -0,0 +1,12 @@ +using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Store.AppBase.Filters; + +namespace WinIn.FasterZ.Store.AppBase; + +public interface ISfsRequest : IPagedAndSortedResultRequest +{ + /// + /// 条件 + /// + public Condition Condition { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs new file mode 100644 index 000000000..12f5d379c --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs @@ -0,0 +1,24 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Application.Dtos; + +namespace WinIn.FasterZ.Store.AppBase +{ + public interface IZbxBase + { + Task> GetPageListByFilterAsync(SfsRequestInputBase sfsRequestInputBase, + bool includeDetails = false, CancellationToken cancellationToken = default); + + /// + /// 【基础】-【导出Excel】【有筛选条件】 + /// + /// 查询条件 + /// 是否冗余主表数据 + /// 是否导出子表 + /// 用户ID + /// + Task ExportToExcelAsync(SfsRequestInputBase sfsRequestInputBase,bool isRedundance, Guid userId,bool isDetailExport = true); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs new file mode 100644 index 000000000..c4a8db43c --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs @@ -0,0 +1,12 @@ +using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Store.AppBase.Filters; + +namespace WinIn.FasterZ.Store.AppBase; + +public class SfsRequestInputBase : PagedAndSortedResultRequestDto, ISfsRequest +{ + /// + /// 条件 + /// + public Condition Condition { get; set; } = new(); +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/AllTableColumnTypeDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/AllTableColumnTypeDto.cs new file mode 100644 index 000000000..4a8c05558 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/AllTableColumnTypeDto.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; + +namespace WinIn.FasterZ.Store.AppBase.TableColumnTypeDto +{ + public class AllTableColumnTypeDto + { + /// + /// 列属性类别 + /// + public List ColumnsTypes { get; set; } + + /// + /// C R U S G + /// + public string DtoType { get; set; } + + /// + /// Dto名称 + /// + public string? DtoName { get; set; } + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/ColumnType.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/ColumnType.cs new file mode 100644 index 000000000..8d756886a --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/TableColumnTypeDto/ColumnType.cs @@ -0,0 +1,31 @@ +using System.ComponentModel.DataAnnotations; + +namespace WinIn.FasterZ.Store.AppBase.TableColumnTypeDto +{ + public class ColumnType + { + /// + /// 列名 + /// + [Display(Name = "列名")] + public string Z_ColumnName { get; set; } + + /// + /// 后端类型 + /// + [Display(Name = "后端类型")] + public string Z_ColumnType { get; set; } + + /// + /// 基础类型 + /// + [Display(Name = "基础类型")] + public string Z_ColumnBaseType { get; set; } + + /// + /// 是否是枚举 + /// + [Display(Name = "是否是枚举")] + public bool IsEnum { get; set; } + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/CreateUpdateExportCustomUserSettingDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/CreateUpdateExportCustomUserSettingDto.cs new file mode 100644 index 000000000..604eed232 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/CreateUpdateExportCustomUserSettingDto.cs @@ -0,0 +1,33 @@ +using System; +using WinIn.FasterZ.Store.Enums; + +namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting.Dtos; + +[Serializable] +public class CreateUpdateExportCustomUserSettingDto +{ + /// + /// 用户ID + /// + public Guid? ExportUserId { get; set; } + + /// + /// 用户姓名 + /// + public string? ExportUserName { get; set; } + + /// + /// 列名 + /// + public string? ExportColumnName { get; set; } + + /// + /// 表名 + /// + public string? ExportTableName { get; set; } + + /// + /// 导出设置项 + /// + public Enum_ExportCustomUserSetting CustomUserSetting { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingDto.cs new file mode 100644 index 000000000..a6e4fd2f8 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingDto.cs @@ -0,0 +1,38 @@ +using System; +using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Store.Enums; + +namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting.Dtos +{ + /// + /// 用户个型导出配置 + /// + [Serializable] + public class ExportCustomUserSettingDto : AuditedEntityDto + { + /// + /// 用户ID + /// + public Guid? ExportUserId { get; set; } + + /// + /// 用户姓名 + /// + public string? ExportUserName { get; set; } + + /// + /// 列名 + /// + public string? ExportColumnName { get; set; } + + /// + /// 表名 + /// + public string? ExportTableName { get; set; } + + /// + /// 导出设置项 + /// + public Enum_ExportCustomUserSetting CustomUserSetting { get; set; } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingGetListInput.cs new file mode 100644 index 000000000..882ae88d3 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/Dtos/ExportCustomUserSettingGetListInput.cs @@ -0,0 +1,36 @@ +using System; +using System.ComponentModel; +using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Store.Enums; + +namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting.Dtos +{ + [Serializable] + public class ExportCustomUserSettingGetListInput : PagedAndSortedResultRequestDto + { + /// + /// 用户ID + /// + public Guid? ExportUserId { get; set; } + + /// + /// 用户姓名 + /// + public string? ExportUserName { get; set; } + + /// + /// 列名 + /// + public string? ExportColumnName { get; set; } + + /// + /// 表名 + /// + public string? ExportTableName { get; set; } + + /// + /// 导出设置项 + /// + public Enum_ExportCustomUserSetting? CustomUserSetting { get; set; } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs new file mode 100644 index 000000000..893800077 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting.Dtos; +using Volo.Abp.Application.Services; + +namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting +{ + /// + /// 用户个型导出配置 + /// + public interface IExportCustomUserSettingAppService : + ICrudAppService< + ExportCustomUserSettingDto, + Guid, + ExportCustomUserSettingGetListInput, + CreateUpdateExportCustomUserSettingDto, + CreateUpdateExportCustomUserSettingDto> + { + /// + /// 根据用户和表名获取个性化导出 + /// + /// + Task> GetByUserIdAndExportTableNameAsync(Guid userId, string exportTableName); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs index 672fffa0f..8f433f7ee 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs @@ -2,24 +2,25 @@ using WinIn.FasterZ.Wms.Localization; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Localization; -namespace WinIn.FasterZ.Wms.Permissions; - -public class WmsPermissionDefinitionProvider : PermissionDefinitionProvider +namespace WinIn.FasterZ.Wms.Permissions { - public override void Define(IPermissionDefinitionContext context) + public class WmsPermissionDefinitionProvider : PermissionDefinitionProvider { - var myGroup = context.AddGroup(WmsPermissions.GroupName); - //Define your own permissions here. Example: - //myGroup.AddPermission(WmsPermissions.MyPermission1, L("Permission:MyPermission1")); + public override void Define(IPermissionDefinitionContext context) + { + var myGroup = context.AddGroup(WmsPermissions.GroupName); + //Define your own permissions here. Example: + //myGroup.AddPermission(WmsPermissions.MyPermission1, L("Permission:MyPermission1")); - var authDepartmentPermission = myGroup.AddPermission(WmsPermissions.AuthDepartment.Default, L("Permission:AuthDepartment")); - authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Create, L("Permission:Create")); - authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Update, L("Permission:Update")); - authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Delete, L("Permission:Delete")); - } + var authDepartmentPermission = myGroup.AddPermission(WmsPermissions.AuthDepartment.Default, L("Permission:AuthDepartment")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Create, L("Permission:Create")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Update, L("Permission:Update")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Delete, L("Permission:Delete")); + } - private static LocalizableString L(string name) - { - return LocalizableString.Create(name); + private static LocalizableString L(string name) + { + return LocalizableString.Create(name); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs index 087235462..0beee58e3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs @@ -1,16 +1,25 @@ -namespace WinIn.FasterZ.Wms.Permissions; - -public static class WmsPermissions +namespace WinIn.FasterZ.Wms.Permissions { - public const string GroupName = "Wms"; - - //Add your own permission names. Example: - //public const string MyPermission1 = GroupName + ".MyPermission1"; - public class AuthDepartment + public static class WmsPermissions { - public const string Default = GroupName + ".AuthDepartment"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; + public const string GroupName = "Wms"; + + //Add your own permission names. Example: + //public const string MyPermission1 = GroupName + ".MyPermission1"; + public class AuthDepartment + { + public const string Default = GroupName + ".AuthDepartment"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + + public class ExportCustomUserSetting + { + public const string Default = GroupName + ".ExportCustomUserSetting"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj index dc3b67831..bcb59f6fd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj @@ -13,6 +13,7 @@ + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsApplicationContractsModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsApplicationContractsModule.cs index 56367433e..64c0bb8e3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsApplicationContractsModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsApplicationContractsModule.cs @@ -7,22 +7,23 @@ using Volo.Abp.PermissionManagement; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; -namespace WinIn.FasterZ.Wms; - -[DependsOn( - typeof(WmsDomainSharedModule), - typeof(AbpAccountApplicationContractsModule), - typeof(AbpFeatureManagementApplicationContractsModule), - typeof(AbpIdentityApplicationContractsModule), - typeof(AbpPermissionManagementApplicationContractsModule), - typeof(AbpSettingManagementApplicationContractsModule), - typeof(AbpTenantManagementApplicationContractsModule), - typeof(AbpObjectExtendingModule) -)] -public class WmsApplicationContractsModule : AbpModule +namespace WinIn.FasterZ.Wms { - public override void PreConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(WmsDomainSharedModule), + typeof(AbpAccountApplicationContractsModule), + typeof(AbpFeatureManagementApplicationContractsModule), + typeof(AbpIdentityApplicationContractsModule), + typeof(AbpPermissionManagementApplicationContractsModule), + typeof(AbpSettingManagementApplicationContractsModule), + typeof(AbpTenantManagementApplicationContractsModule), + typeof(AbpObjectExtendingModule) + )] + public class WmsApplicationContractsModule : AbpModule { - WmsDtoExtensions.Configure(); + public override void PreConfigureServices(ServiceConfigurationContext context) + { + WmsDtoExtensions.Configure(); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsDtoExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsDtoExtensions.cs index d6b876125..4bade1468 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsDtoExtensions.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WmsDtoExtensions.cs @@ -2,16 +2,16 @@ using Volo.Abp.ObjectExtending; using Volo.Abp.Threading; -namespace WinIn.FasterZ.Wms; - -public static class WmsDtoExtensions +namespace WinIn.FasterZ.Wms { - private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); - - public static void Configure() + public static class WmsDtoExtensions { - OneTimeRunner.Run(() => + private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); + + public static void Configure() { + OneTimeRunner.Run(() => + { /* You can add extension properties to DTOs * defined in the depended modules. * @@ -23,6 +23,7 @@ public static class WmsDtoExtensions * See the documentation for more: * https://docs.abp.io/en/abp/latest/Object-Extensions */ - }); + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentGetListInput.cs index f1d790f37..bc17520ed 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentGetListInput.cs @@ -2,20 +2,21 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; -namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; - -[Serializable] -public class AuthDepartmentGetListInput : PagedAndSortedResultRequestDto +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos { - public string? Code { get; set; } + [Serializable] + public class AuthDepartmentGetListInput : PagedAndSortedResultRequestDto + { + public string? Code { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public Guid? Id { get; set; } + public Guid? Id { get; set; } - public bool? IsActive { get; set; } + public bool? IsActive { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/CreateUpdateAuthDepartmentDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/CreateUpdateAuthDepartmentDto.cs index 08850bcc6..d6646db74 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/CreateUpdateAuthDepartmentDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/CreateUpdateAuthDepartmentDto.cs @@ -1,19 +1,20 @@ using System; -namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; - -[Serializable] -public class CreateUpdateAuthDepartmentDto +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos { - public string Code { get; set; } + [Serializable] + public class CreateUpdateAuthDepartmentDto + { + public string Code { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public Guid Id { get; set; } + public Guid Id { get; set; } - public bool? IsActive { get; set; } + public bool? IsActive { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/IAuthDepartmentAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/IAuthDepartmentAppService.cs index 6274f55be..663a7665a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/IAuthDepartmentAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/IAuthDepartmentAppService.cs @@ -2,16 +2,16 @@ using System; using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; using Volo.Abp.Application.Services; -namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; - - -public interface IAuthDepartmentAppService : - ICrudAppService< - AuthDepartmentDto, - Guid, - AuthDepartmentGetListInput, - CreateUpdateAuthDepartmentDto, - CreateUpdateAuthDepartmentDto> +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment { + public interface IAuthDepartmentAppService : + ICrudAppService< + AuthDepartmentDto, + Guid, + AuthDepartmentGetListInput, + CreateUpdateAuthDepartmentDto, + CreateUpdateAuthDepartmentDto> + { + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ExpressionExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ExpressionExtensions.cs new file mode 100644 index 000000000..a0b3d41aa --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ExpressionExtensions.cs @@ -0,0 +1,27 @@ +using System.Linq.Expressions; + +namespace WinIn.FasterZ.Wms.AppBase.Extensions +{ + public static class ExpressionExtensions + { + public static string GetMemberName(Expression expression) + { + if (expression is MemberExpression member) + { + return member.Member.Name; + } + + if (expression is MethodCallExpression method) + { + return method.Method.Name; + } + + if (expression is UnaryExpression unary) + { + return GetMemberName(unary); + } + + return null; + } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectExpressionExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectExpressionExtensions.cs new file mode 100644 index 000000000..ee6eeac8b --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectExpressionExtensions.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Linq.Dynamic.Core; +using System.Linq.Expressions; +using System.Reflection; + +namespace WinIn.FasterZ.Wms.AppBase.Extensions +{ + public static class ObjectExpressionExtensions + { + public static IQueryable WhereByKey(this IQueryable source, TModel model) + { + if (model == null) + { + return null; + } + + var modelType = model.GetType(); + var properties = modelType.GetProperties().Where(o => o.GetCustomAttribute() != null).ToList(); + if (properties.Any()) + { + foreach (var property in properties) + { + var propertyName = property.Name; + var propertyValue = property.GetValue(model, null); + source = source.Where($"{propertyName} == @0", propertyValue); + } + + return source; + } + + return null; + } + + public static List> GroupByKey(this IQueryable source) + { + var properties = typeof(T).GetProperties().Where(o => o.GetCustomAttribute() != null).ToList(); + var names = string.Join(",", properties.Select(o => o.Name)); + return source.AsQueryable().GroupBy($"new ({names})").ToDynamicList>(); + } + + public static Expression> GetExpressionByProperty(this Type type, string propertyName, + string propertyValue) + { + var o = Expression.Parameter(type, "p"); + var memberExpression = Expression.Property(o, propertyName); + var body = Expression.Call(typeof(string).GetMethod("Contains", new[] { typeof(string) }), memberExpression); + var predicate = Expression.Lambda>(body, o); + return predicate; + } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectMapperExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectMapperExtensions.cs new file mode 100644 index 000000000..50c734f1e --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/ObjectMapperExtensions.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Reflection; +using Omu.ValueInjecter; +using Omu.ValueInjecter.Injections; +using Volo.Abp; + +namespace WinIn.FasterZ.Wms.AppBase.Extensions +{ + /// + /// 对象映射 + /// + public static class ObjectMapperExtensions + { + /// + /// 从模型更新实体 + /// + public static T FromObject(this T to, object from) + { + try + { + to.InjectFrom(from); + return to; + } + catch (Exception ex) + { + throw new UserFriendlyException($"{from.GetType().FullName}映射到${typeof(T).FullName}时失败:{ex.Message},{ex}"); + } + } + + /// + /// 从实体创建模型 + /// + /// + /// + /// + public static T ToObject(this object from) + { + try + { + if (typeof(T).IsGenericType && typeof(T).IsAssignableTo(typeof(IList)) && from is IList list) + { + var toListType = typeof(T); + var elementType = typeof(T).GetGenericArguments()[0]; + var toList = (IList)Activator.CreateInstance(typeof(T))!; + var fromList = list; + foreach (var item in fromList) + { + toList.Add(Activator.CreateInstance(elementType).InjectFrom(item)); + } + + return (T)toList; + } + + return (T)Activator.CreateInstance().InjectFrom(from); + } + catch (Exception ex) + { + throw new UserFriendlyException($"{from.GetType().FullName}映射到${typeof(T).FullName}时失败:{ex.Message},{ex}"); + } + } + + private class DeepInjection : LoopInjection + { + protected override bool MatchTypes(Type sourceType, Type targetType) + { + if (sourceType != typeof(string) && + targetType != typeof(string) && + sourceType.IsGenericType && + targetType.IsGenericType && + sourceType.IsAssignableTo(typeof(IEnumerable)) && + sourceType.IsAssignableTo(typeof(IEnumerable)) + ) + { + return true; + } + + return base.MatchTypes(sourceType, targetType); + } + + protected override void SetValue(object source, object target, PropertyInfo sp, PropertyInfo tp) + { + if (sp.PropertyType != typeof(string) && + sp.PropertyType != typeof(string) && + sp.PropertyType.IsAssignableTo(typeof(IList)) && + tp.PropertyType.IsAssignableTo(typeof(IList))) + { + var targetGenericType = tp.PropertyType.GetGenericArguments()[0]; + var listType = typeof(List<>).MakeGenericType(targetGenericType); + var addMethod = listType.GetMethod("Add"); + var list = Activator.CreateInstance(listType); + var sourceList = (IList)sp.GetValue(source); + foreach (var item in sourceList) + { + addMethod.Invoke(list, new[] { Activator.CreateInstance(targetGenericType).FromObject(item) }); + } + + tp.SetValue(target, list); + return; + } + + base.SetValue(source, target, sp, tp); + } + } + + private class DeepInjectionForUpdate : DeepInjection + { + protected override void SetValue(object source, object target, PropertyInfo sp, PropertyInfo tp) + { + //if (tp.GetCustomAttribute() != null) + //{ + // return; + //} + base.SetValue(source, target, sp, tp); + } + } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/StringExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/StringExtensions.cs new file mode 100644 index 000000000..c05983405 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/Extensions/StringExtensions.cs @@ -0,0 +1,17 @@ +using System; +using System.Security.Cryptography; +using System.Text; + +namespace WinIn.FasterZ.Wms.AppBase.Extensions +{ + public static class StringExtensions + { + public static string Md5(this string input) + { + using (var md5 = MD5.Create()) + { + return BitConverter.ToString(md5.ComputeHash(Encoding.ASCII.GetBytes(input))).Replace("-", ""); + } + } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs new file mode 100644 index 000000000..b842e0c46 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs @@ -0,0 +1,711 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Linq.Dynamic.Core; +using System.Linq.Expressions; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Localization; +using NPOI.SS.UserModel; +using NPOI.XSSF.UserModel; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Repositories; +using WinIn.FasterZ.Store.AppBase.Filters; +using WinIn.FasterZ.Store.AppBase.TableColumnTypeDto; +using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting; +using WinIn.FasterZ.Store.Enums; +using WinIn.FasterZ.Wms.AppBase.Extensions; +using WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting; + +namespace WinIn.FasterZ.Store.AppBase; + +using WinIn.FasterZ.Wms.Localization; + +public class ZbxBase : + CrudAppService, + IZbxBase + where TEntity : class, IEntity + where TEntityDto : IEntityDto +{ + private readonly IRepository _repository; + + public ZbxBase(IRepository repository) : base(repository) + { + _repository = repository; + } + + protected IStringLocalizer Localizer => + LazyServiceProvider.LazyGetRequiredService>(); + + protected ExportCustomUserSettingAppService ExportCustomUserSettingAppService => + LazyServiceProvider.LazyGetRequiredService(); + + #region 公开接口 + + /// + /// 【基础】-【分页查询】【有筛选条件】 + /// + /// + /// + /// + /// + [HttpPost("api/[controller]/base/get-list-page-by-filter")] + [Authorize] + public async Task> GetPageListByFilterAsync(SfsRequestInputBase sfsRequestInputBase, + bool includeDetails = false, CancellationToken cancellationToken = default) + { + await CheckGetListPolicyAsync(); + + var expression = sfsRequestInputBase.Condition.Filters?.Count > 0 + ? sfsRequestInputBase.Condition.Filters.ToLambda() + : p => true; + + var resultEntities = await GetQueryListAsync(expression, sfsRequestInputBase.SkipCount, + sfsRequestInputBase.MaxResultCount, + sfsRequestInputBase.Sorting, includeDetails, cancellationToken); + + var resultDtos = ObjectMapper.Map, List>(resultEntities); + + //获取总数 + var totalCount = await GetCountAsync(expression, cancellationToken); + + return new PagedResultDto(totalCount, resultDtos); + } + + /// + /// 【基础】-【新增】 + /// + /// + /// + [HttpPost("api/[controller]/base/create")] + public override async Task CreateAsync(TCreateInput input) + { + await CheckCreatePolicyAsync(); + + var entity = input!.ToObject(); + + //判断id是否是00000-0000 如果是则赋值 + var mainId = (Guid)entity.GetType().GetProperty("Id")?.GetValue(entity)!; + if (mainId == Guid.Empty) + { + mainId = Guid.NewGuid(); + entity.GetType().GetProperty("Id")?.SetValue(entity, mainId); + } + + #region 给所有字表的 Id和MasterId赋值 否则默认的会是000000-000-....的id 插入时会报错 + + var propertyInfos = entity.GetType().GetProperties(); + foreach (var propertyInfo in propertyInfos) + { + //判断是否是List集合 + if (propertyInfo.Name == "Details" + && propertyInfo.PropertyType.IsGenericType + && propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(List<>)) + { + var listProperty = typeof(TEntity).GetProperty("Details"); + + // 获取 List 的元素类型 + if (listProperty != null) + { + var listItemType = listProperty.PropertyType.GetGenericArguments()[0]; + + // 获取元素类型的 ID 属性 + var detailIdProperty = listItemType.GetProperty("Id"); + var masterIdProperty = listItemType.GetProperty("MasterId"); + + if (detailIdProperty != null) + { + // 获取 List 属性的值 + var list = (IList)listProperty.GetValue(entity); + + // 遍历 List 集合中的每个元素，给 ID 属性赋值 + if (list != null) + { + foreach (var item in list) + { + if ((Guid)detailIdProperty.GetValue(item)! == Guid.Empty) + { + detailIdProperty.SetValue(item, Guid.NewGuid()); + } + } + } + } + + if (masterIdProperty != null) + { + // 获取 List 属性的值 + var list = (IList)listProperty.GetValue(entity); + + // 遍历 List 集合中的每个元素，给 ID 属性赋值 + if (list != null) + { + foreach (var item in list) + { + masterIdProperty.SetValue(item, mainId); + } + } + } + } + } + } + + #endregion + + TryToSetTenantId(entity); + await Repository.InsertAsync(entity, true); + return await MapToGetOutputDtoAsync(entity); + } + + /// + /// 【基础】-【删除】 + /// + /// + /// + [HttpDelete("api/[controller]/base/delete-by-id")] + public override async Task DeleteAsync(TKey id) + { + await base.DeleteAsync(id); + } + + /// + /// 【基础】-【修改】 + /// + /// + /// + /// + [HttpPut("api/[controller]/base/update-by-id")] + public override async Task UpdateAsync(TKey id, TUpdateInput input) + { + //return base.UpdateAsync(id, input); + + await CheckUpdatePolicyAsync().ConfigureAwait(false); + var entity = await GetEntityByIdAsync(id).ConfigureAwait(false); + entity.FromObject(input!); + + #region 给所有字表的 Id和MasterId赋值 否则默认的会是000000-000-....的id 插入时会报错 + + var propertyInfos = entity.GetType().GetProperties(); + foreach (var propertyInfo in propertyInfos) + { + //判断是否是List集合 + if (propertyInfo.Name == "Details" + && propertyInfo.PropertyType.IsGenericType + && propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(List<>)) + { + var listProperty = typeof(TEntity).GetProperty("Details"); + + // 获取 List 的元素类型 + if (listProperty != null) + { + var listItemType = listProperty.PropertyType.GetGenericArguments()[0]; + + // 获取元素类型的 ID 属性 + var detailIdProperty = listItemType.GetProperty("Id"); + var masterIdProperty = listItemType.GetProperty("MasterId"); + + if (detailIdProperty != null) + { + // 获取 List 属性的值 + var list = (IList)listProperty.GetValue(entity); + + // 遍历 List 集合中的每个元素，给 ID 属性赋值 + if (list != null) + { + foreach (var item in list) + { + if ((Guid)detailIdProperty.GetValue(item)! == Guid.Empty) + { + detailIdProperty.SetValue(item, Guid.NewGuid()); + } + } + } + } + + if (masterIdProperty != null) + { + // 获取 List 属性的值 + var list = (IList)listProperty.GetValue(entity); + + // 遍历 List 集合中的每个元素，给 ID 属性赋值 + if (list != null) + { + foreach (var item in list) + { + masterIdProperty.SetValue(item, id); + } + } + } + } + } + } + + #endregion + + await Repository.UpdateAsync(entity, true); + + return await MapToGetOutputDtoAsync(entity); + } + + /// + /// 【基础】-【导出Excel】【有筛选条件】 + /// + /// 查询条件 + /// 是否冗余主表数据 + /// 是否导出子表 + /// 用户ID + /// + [HttpPost("api/[controller]/base/export-to-excel")] + public virtual async Task ExportToExcelAsync(SfsRequestInputBase sfsRequestInputBase, + bool isRedundance, Guid userId, bool isDetailExport = true) + { + var isHasDetail = false; //是否包含从表 + + var data = (await GetPageListByFilterAsync(sfsRequestInputBase, true)).Items; + + var fileStream = new MemoryStream(); //文件流 + IWorkbook workbook = new XSSFWorkbook(); + var sheet = workbook.CreateSheet(Localizer[typeof(TEntity).Name]); + var splitDetailsColumnNumber = 1; //分割主表和从表的列数量 + var excelDetailsCellStyle = SetExcelDetailsCellStyle(workbook); //子表单元格样式 + var excelSplitCellStyle = SetSplitCellStyle(workbook); //分割单元格样式 + var excelOnlyMainCellStyle = SetExcelOnlyMainCellStyle(workbook); + var excelHeadCellStyle = SetExcelHeadCellStyle(workbook); + + // 获取主表的属性 创建主表 表头 + var mainAllProperties = typeof(TEntityDto).GetProperties(); + var mainProperties = mainAllProperties.Where(p => p.Name != "Details").ToArray(); //去除details属性否则导出时会带出来 + + #region 用户个性导出 主表 + + //获取个性导出的字段 + var mainUserColumn = + await ExportCustomUserSettingAppService.GetByUserIdAndExportTableNameAsync(userId, typeof(TEntity).Name); + + if (mainUserColumn.Any(p => p.CustomUserSetting == Enum_ExportCustomUserSetting.Yes)) + { + var showUserColumn = mainUserColumn.Where(p => p.CustomUserSetting == Enum_ExportCustomUserSetting.Yes) + .Select(p => p.ExportColumnName?.ToLower()).Aggregate((a, b) => a + " " + b)?.Split(' ').ToList(); + + mainProperties = mainProperties.Where(p => showUserColumn.Contains(p.Name.ToLower())).ToArray(); + } + + #endregion + + var headerRow = sheet.CreateRow(0); //标头列 + for (var i = 0; i < mainProperties.Length; i++) + { + var englishName = mainProperties[i].Name; + //本地化 + var localizerName = Localizer[typeof(TEntity).Name + englishName]; + var headCell = headerRow.CreateCell(i); + headCell.SetCellValue(localizerName); + headCell.CellStyle = excelHeadCellStyle; + } + + // 获取从表的属性 创建从表 表头 + var detailProperties = typeof(TEntityDto).GetProperty("Details")?.PropertyType.GetGenericArguments()[0] + .GetProperties(); + + if (detailProperties != null) + { + isHasDetail = true; + if (!isDetailExport) //是否要导出子表 + { + isHasDetail = false; + } + + if (isHasDetail) + { + headerRow.CreateCell(mainProperties.Length).SetCellValue("---【分割】---"); + + #region 用户个性导出 从表 + + //获取个性导出的字段 + var detailDtoName = mainAllProperties.First(p => p.Name == "Details"); + var detailUserColumn = await ExportCustomUserSettingAppService.GetByUserIdAndExportTableNameAsync( + userId, detailDtoName.PropertyType.GenericTypeArguments.First().Name.Replace("Dto", "")); + var detailNotShowUserColumn = detailUserColumn + .Where(p => p.CustomUserSetting == Enum_ExportCustomUserSetting.No).Select(p => p.ExportColumnName) + .ToList(); + if (detailUserColumn.Any()) + { + detailProperties = detailProperties.Where(p => !detailNotShowUserColumn.Contains(p.Name)).ToArray(); + } + + #endregion + + for (var i = 0; i < detailProperties.Length; i++) + { + headerRow.CreateCell(mainProperties.Length + splitDetailsColumnNumber + i) + .SetCellValue(detailProperties[i].Name); + var headCell = headerRow.GetCell(mainProperties.Length + splitDetailsColumnNumber + i); + headCell.CellStyle = excelHeadCellStyle; + } + } + } + + // 填充数据行 + var rowIndex = 1; + foreach (var mainDto in data) + { + if (isHasDetail) + { + // 获取从表数据 + var detailsIndex = mainAllProperties.FindIndex(p => p.Name == "Details"); + // 子表 + var detailList = (IEnumerable)mainAllProperties[detailsIndex].GetValue(mainDto); + var startMainRowIndex = rowIndex; + for (var datailCount = 0; datailCount < detailList.Count(); datailCount++) + { + var dataRow = sheet.CreateRow(rowIndex); + + if (isRedundance) + { + // 填充主表数据 + for (var i = 0; i < mainProperties.Length; i++) + { + var value = mainProperties[i].GetValue(mainDto); + dataRow.CreateCell(i).SetCellValue(value?.ToString()); + } + } + else + { + if (datailCount == 0) + { + // 填充主表数据 + for (var i = 0; i < mainProperties.Length; i++) + { + var value = mainProperties[i].GetValue(mainDto); + dataRow.CreateCell(i).SetCellValue(value?.ToString()); + } + } + } + + rowIndex++; + } + + var overMainRowIndex = rowIndex; + foreach (var detail in detailList) + { + if (startMainRowIndex <= overMainRowIndex) + { + //填充子表数据 + var detailRow = sheet.GetRow(startMainRowIndex); + + var splitCell = detailRow.CreateCell(mainProperties.Length); + splitCell.CellStyle = excelSplitCellStyle; + + for (var i = 0; i < detailProperties.Length; i++) + { + var value = detailProperties[i].GetValue(detail); + detailRow.CreateCell(mainProperties.Length + splitDetailsColumnNumber + i) + .SetCellValue(value?.ToString()); + var detailCell = detailRow.GetCell(mainProperties.Length + splitDetailsColumnNumber + i); + detailCell.CellStyle = excelDetailsCellStyle; + } + } + + startMainRowIndex++; + } + } + else + { + var dataRow = sheet.CreateRow(rowIndex); + // 填充主表数据 + for (var i = 0; i < mainProperties.Length; i++) + { + var value = mainProperties[i].GetValue(mainDto); + dataRow.CreateCell(i).SetCellValue(value?.ToString()); + } + + if (rowIndex % 2 == 0) + { + dataRow.RowStyle = excelOnlyMainCellStyle; + } + } + + //添加1个空行将2条数据分割开 + rowIndex++; + } + + #region 自动调整列宽 + + // 自动调整列宽 注意：这个影响性能 会遍历所有行 并且找出宽度最大值 + //sheet.AutoSizeColumn(i); + if (isHasDetail) + { + for (var i = 0; i < mainProperties.Length + splitDetailsColumnNumber + detailProperties.Length; i++) + { + var colWidth = Math.Max(sheet.GetColumnWidth(i) + 150, 265 * 15); + if (colWidth > 255 * 256)//excel列有最大宽度限制 + { + colWidth = 6000; + } + + sheet.SetColumnWidth(i, colWidth); + sheet.SetColumnWidth(mainProperties.Length, 3600); + } + } + else + { + for (var i = 0; i < mainProperties.Length; i++) + { + var colWidth = Math.Max(sheet.GetColumnWidth(i) + 150, 265 * 15); + if (colWidth > 255 * 256)//excel列有最大宽度限制 + { + colWidth = 6000; + } + + sheet.SetColumnWidth(i, colWidth); + } + } + + #endregion + + // 保存Excel文件到MemoryStream + workbook.Write(fileStream, true); + fileStream.Position = 0; + + // 创建FileContentResult返回Excel文件 + var fileContentResult = new FileContentResult(fileStream.ToArray(), + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") + { + FileDownloadName = Localizer[typeof(TEntity).Name] + ".xlsx" + }; + + await Task.CompletedTask; + + return fileContentResult; + } + + /// + /// 【基础】-【获取 增 改 查基础的Dto数据类型】 + /// + /// + [HttpPost("api/[controller]/base/get-dto-column-type")] + public virtual async Task> GetDtoColumnTypeAsync() + { + var tableColumnTypeDtos = new List + { + GetTableColumnTypeByTable(typeof(TEntity), "S"), + GetTableColumnTypeByTable(typeof(TCreateInput), "C"), + GetTableColumnTypeByTable(typeof(TUpdateInput), "U"), + GetTableColumnTypeByTable(typeof(TEntity), "G") + }; + + await Task.CompletedTask; + return tableColumnTypeDtos; + } + + #endregion + + #region 私有处理 + + /// + /// 按表达式条件获取分页列表 + /// + /// + /// + /// + /// + /// + /// + /// + private async Task> GetQueryListAsync(Expression> expression, + int skipCount, int maxResultCount, string sorting, + bool includeDetails = false, CancellationToken cancellationToken = default) + { + var query = await Repository.WithDetailsAsync(); + //var query = await Repository.GetQueryableAsync(); + + var entities = query.Where(expression); + entities = GetSortingQueryable(entities, sorting); + var str = entities.ToQueryString(); + + Console.WriteLine("---------查询开始---------"); + Console.WriteLine(); + Console.WriteLine(str); + Console.WriteLine(); + Console.WriteLine("---------查询结束---------"); + + var result = await entities.PageBy(skipCount, maxResultCount).ToListAsync(cancellationToken) + .ConfigureAwait(false); + + return result; + } + + /// + /// 设置排序 + /// + /// + /// + /// + private IQueryable GetSortingQueryable(IQueryable entities, string sorting) + { + if (string.IsNullOrEmpty(sorting)) + { + var createTimePropertyInfo = typeof(TEntity).GetProperty("CreationTime"); + if (createTimePropertyInfo != null) + { + entities = entities.OrderBy("CreationTime DESC"); + } + else + { + entities = entities.OrderBy("Id"); + } + } + else + { + var sortParams = sorting?.Split(' '); + var sortName = sortParams[0]; + var ascOrDesc = string.Empty; + if (sortParams.Length > 1) + { + var sortDirection = sortParams[1]; + if (sortDirection.Equals("DESC", StringComparison.OrdinalIgnoreCase)) + { + ascOrDesc = " DESC "; + } + } + else + { + ascOrDesc = " DESC "; + } + + entities = entities.OrderBy(sortName + ascOrDesc); + } + + return entities; + } + + /// + /// 获取Dto的属性名字和数据类型 + /// + /// + /// + /// + private AllTableColumnTypeDto GetTableColumnTypeByTable(Type dtoType, string strDtoType) + { + var gDto = new AllTableColumnTypeDto + { + DtoType = strDtoType, + DtoName = dtoType.FullName, + ColumnsTypes = new List() + }; + var propertyInfos = dtoType.GetProperties(); + foreach (var propertyInfo in propertyInfos) + { + var columnType = new ColumnType(); + columnType.IsEnum = false; + if (propertyInfo.PropertyType.GenericTypeArguments.Length > 0) + { + if (propertyInfo.PropertyType.GenericTypeArguments[0].IsEnum) + { + columnType.IsEnum = true; + } + + columnType.Z_ColumnBaseType = propertyInfo.PropertyType.GenericTypeArguments[0].FullName!; + } + else + { + columnType.Z_ColumnBaseType = propertyInfo.PropertyType.FullName!; + } + + columnType.Z_ColumnName = propertyInfo.Name; + columnType.Z_ColumnType = propertyInfo.PropertyType.Name; + + + gDto.ColumnsTypes.Add(columnType); + } + + return gDto; + } + + /// + /// 【记录数量查询】【有筛选条件】 + /// + /// + /// + /// + private async Task GetCountAsync(Expression> expression, + CancellationToken cancellationToken = default) + { + var count = await _repository.LongCountAsync(expression, cancellationToken); + + return count; + } + + #region Excel导出的样式设置 + + /// + /// 导出设置子表单元格样式 + /// + /// + /// + private static ICellStyle SetExcelDetailsCellStyle(IWorkbook workbook) + { + var cellStyle = workbook.CreateCellStyle(); + cellStyle.FillBackgroundColor = IndexedColors.Grey25Percent.Index; + cellStyle.FillForegroundColor = IndexedColors.Grey25Percent.Index; + cellStyle.FillPattern = FillPattern.SolidForeground; + return cellStyle; + } + + /// + /// 导出设置只有主表时的交替行 单元格样式 + /// + /// + /// + private static ICellStyle SetExcelOnlyMainCellStyle(IWorkbook workbook) + { + var cellStyle = workbook.CreateCellStyle(); + cellStyle.FillBackgroundColor = IndexedColors.Grey25Percent.Index; + cellStyle.FillForegroundColor = IndexedColors.Grey25Percent.Index; + cellStyle.FillPattern = FillPattern.SolidForeground; + return cellStyle; + } + + /// + /// 设置分割单元格的样式 + /// + /// + /// + private static ICellStyle SetSplitCellStyle(IWorkbook workbook) + { + var cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderLeft = BorderStyle.MediumDashed; + cellStyle.BorderRight = BorderStyle.MediumDashed; + cellStyle.LeftBorderColor = IndexedColors.BrightGreen.Index; + cellStyle.RightBorderColor = IndexedColors.Grey25Percent.Index; + cellStyle.FillBackgroundColor = IndexedColors.White.Index; + cellStyle.FillForegroundColor = IndexedColors.White.Index; + cellStyle.FillPattern = FillPattern.ThickVerticalBands; + return cellStyle; + } + + /// + /// 导出设置表头单元格样式 + /// + /// + /// + private static ICellStyle SetExcelHeadCellStyle(IWorkbook workbook) + { + var cellStyle = workbook.CreateCellStyle(); + cellStyle.FillBackgroundColor = IndexedColors.LightOrange.Index; + cellStyle.FillForegroundColor = IndexedColors.LightOrange.Index; + cellStyle.FillPattern = FillPattern.SolidForeground; + return cellStyle; + } + + #endregion + + #endregion +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs new file mode 100644 index 000000000..f3e1afd25 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using WinIn.FasterZ.Store.AppBase; +using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting; +using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting.Dtos; +using WinIn.FasterZ.Wms.Permissions; + +namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting +{ + /// + /// 用户个型导出配置 + /// + public class ExportCustomUserSettingAppService : ZbxBase, + IExportCustomUserSettingAppService + { + private readonly IExportCustomUserSettingRepository _repository; + + public ExportCustomUserSettingAppService(IExportCustomUserSettingRepository repository) : base(repository) + { + _repository = repository; + } + + protected override string GetPolicyName { get; set; } =WmsPermissions.ExportCustomUserSetting.Default; + protected override string GetListPolicyName { get; set; } = WmsPermissions.ExportCustomUserSetting.Default; + protected override string CreatePolicyName { get; set; } = WmsPermissions.ExportCustomUserSetting.Create; + protected override string UpdatePolicyName { get; set; } = WmsPermissions.ExportCustomUserSetting.Update; + protected override string DeletePolicyName { get; set; } = WmsPermissions.ExportCustomUserSetting.Delete; + + /// + /// 根据用户和表名获取个性化导出 + /// + /// + [HttpPost("get-by-user-and-table-name")] + public virtual async Task> GetByUserIdAndExportTableNameAsync(Guid userId, + string exportTableName) + { + var entitys = + await _repository.GetListAsync(p => p.ExportUserId == userId && p.ExportTableName == exportTableName); + + return ObjectMapper.Map, List>(entitys); + } + + protected override async Task> CreateFilteredQueryAsync( + ExportCustomUserSettingGetListInput input) + { + // TODO: AbpHelper generated + return (await base.CreateFilteredQueryAsync(input)) + .WhereIf(input.ExportUserId != null, x => x.ExportUserId == input.ExportUserId) + .WhereIf(!input.ExportUserName.IsNullOrWhiteSpace(), x => x.ExportUserName.Contains(input.ExportUserName)) + .WhereIf(!input.ExportColumnName.IsNullOrWhiteSpace(), + x => x.ExportColumnName.Contains(input.ExportColumnName)) + .WhereIf(!input.ExportTableName.IsNullOrWhiteSpace(), + x => x.ExportTableName.Contains(input.ExportTableName)) + .WhereIf(input.CustomUserSetting != null, x => x.CustomUserSetting == input.CustomUserSetting) + ; + } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj index 5cbf1d9b5..b03681648 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj @@ -14,6 +14,8 @@ + + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsAppService.cs index e0c1868a3..be9392aab 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsAppService.cs @@ -4,14 +4,15 @@ using System.Text; using WinIn.FasterZ.Wms.Localization; using Volo.Abp.Application.Services; -namespace WinIn.FasterZ.Wms; - -/* Inherit your application services from this class. - */ -public abstract class WmsAppService : ApplicationService +namespace WinIn.FasterZ.Wms { - protected WmsAppService() + /* Inherit your application services from this class. + */ + public abstract class WmsAppService : ApplicationService { - LocalizationResource = typeof(WmsResource); + protected WmsAppService() + { + LocalizationResource = typeof(WmsResource); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs index dfaf1ddae..385399f88 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs @@ -2,16 +2,17 @@ using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; using AutoMapper; -namespace WinIn.FasterZ.Wms; - -public class WmsApplicationAutoMapperProfile : Profile +namespace WinIn.FasterZ.Wms { - public WmsApplicationAutoMapperProfile() + public class WmsApplicationAutoMapperProfile : Profile { - /* You can configure your AutoMapper mapping configuration here. - * Alternatively, you can split your mapping configurations - * into multiple profile classes for a better organization. */ - CreateMap(); - CreateMap(MemberList.Source); + public WmsApplicationAutoMapperProfile() + { + /* You can configure your AutoMapper mapping configuration here. + * Alternatively, you can split your mapping configurations + * into multiple profile classes for a better organization. */ + CreateMap(); + CreateMap(MemberList.Source); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationModule.cs index f05002d7d..c0cdb5fe3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationModule.cs @@ -7,25 +7,26 @@ using Volo.Abp.PermissionManagement; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; -namespace WinIn.FasterZ.Wms; - -[DependsOn( - typeof(WmsDomainModule), - typeof(AbpAccountApplicationModule), - typeof(WmsApplicationContractsModule), - typeof(AbpIdentityApplicationModule), - typeof(AbpPermissionManagementApplicationModule), - typeof(AbpTenantManagementApplicationModule), - typeof(AbpFeatureManagementApplicationModule), - typeof(AbpSettingManagementApplicationModule) - )] -public class WmsApplicationModule : AbpModule +namespace WinIn.FasterZ.Wms { - public override void ConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(WmsDomainModule), + typeof(AbpAccountApplicationModule), + typeof(WmsApplicationContractsModule), + typeof(AbpIdentityApplicationModule), + typeof(AbpPermissionManagementApplicationModule), + typeof(AbpTenantManagementApplicationModule), + typeof(AbpFeatureManagementApplicationModule), + typeof(AbpSettingManagementApplicationModule) + )] + public class WmsApplicationModule : AbpModule { - Configure(options => + public override void ConfigureServices(ServiceConfigurationContext context) { - options.AddMaps(); - }); + Configure(options => + { + options.AddMaps(); + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/AuthDepartment/AuthDepartmentAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/AuthDepartment/AuthDepartmentAppService.cs index 407d3075d..886efac21 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/AuthDepartment/AuthDepartmentAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/AuthDepartment/AuthDepartmentAppService.cs @@ -1,14 +1,14 @@ using System; using System.Linq; using System.Threading.Tasks; +using Volo.Abp.Application.Services; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; -using Volo.Abp.Application.Services; namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; - -public class AuthDepartmentAppService : CrudAppService, +public class AuthDepartmentAppService : CrudAppService, IAuthDepartmentAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.AuthDepartment.Default; @@ -36,4 +36,4 @@ public class AuthDepartmentAppService : CrudAppService x.Remark == input.Remark) ; } -} +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Pages/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Pages/Index.cshtml.cs index fa1775b7a..12501af8f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Pages/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Pages/Index.cshtml.cs @@ -5,31 +5,32 @@ using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; using Volo.Abp.Localization; using Volo.Abp.OpenIddict.Applications; -namespace WinIn.FasterZ.Wms.Pages; - -public class IndexModel : AbpPageModel +namespace WinIn.FasterZ.Wms.Pages { - public List? Applications { get; protected set; } + public class IndexModel : AbpPageModel + { + public List? Applications { get; protected set; } - public IReadOnlyList? Languages { get; protected set; } + public IReadOnlyList? Languages { get; protected set; } - public string? CurrentLanguage { get; protected set; } + public string? CurrentLanguage { get; protected set; } - protected IOpenIddictApplicationRepository OpenIdApplicationRepository { get; } + protected IOpenIddictApplicationRepository OpenIdApplicationRepository { get; } - protected ILanguageProvider LanguageProvider { get; } + protected ILanguageProvider LanguageProvider { get; } - public IndexModel(IOpenIddictApplicationRepository openIdApplicationRepository, ILanguageProvider languageProvider) - { - OpenIdApplicationRepository = openIdApplicationRepository; - LanguageProvider = languageProvider; - } + public IndexModel(IOpenIddictApplicationRepository openIdApplicationRepository, ILanguageProvider languageProvider) + { + OpenIdApplicationRepository = openIdApplicationRepository; + LanguageProvider = languageProvider; + } - public async Task OnGetAsync() - { - Applications = await OpenIdApplicationRepository.GetListAsync(); + public async Task OnGetAsync() + { + Applications = await OpenIdApplicationRepository.GetListAsync(); - Languages = await LanguageProvider.GetLanguagesAsync(); - CurrentLanguage = CultureInfo.CurrentCulture.DisplayName; + Languages = await LanguageProvider.GetLanguagesAsync(); + CurrentLanguage = CultureInfo.CurrentCulture.DisplayName; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Program.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Program.cs index eee69030a..18c515086 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Program.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/Program.cs @@ -6,51 +6,52 @@ using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; -namespace WinIn.FasterZ.Wms; - -public class Program +namespace WinIn.FasterZ.Wms { - public async static Task Main(string[] args) + public class Program { - Log.Logger = new LoggerConfiguration() + public async static Task Main(string[] args) + { + Log.Logger = new LoggerConfiguration() #if DEBUG - .MinimumLevel.Debug() + .MinimumLevel.Debug() #else .MinimumLevel.Information() #endif - .MinimumLevel.Override("Microsoft", LogEventLevel.Information) - .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning) - .Enrich.FromLogContext() - .WriteTo.Async(c => c.File("Logs/logs.txt")) - .WriteTo.Async(c => c.Console()) - .CreateLogger(); + .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning) + .Enrich.FromLogContext() + .WriteTo.Async(c => c.File("Logs/logs.txt")) + .WriteTo.Async(c => c.Console()) + .CreateLogger(); - try - { - Log.Information("Starting WinIn.FasterZ.Wms.AuthServer."); - var builder = WebApplication.CreateBuilder(args); - builder.Host.AddAppSettingsSecretsJson() - .UseAutofac() - .UseSerilog(); - await builder.AddApplicationAsync(); - var app = builder.Build(); - await app.InitializeApplicationAsync(); - await app.RunAsync(); - return 0; - } - catch (Exception ex) - { - if (ex is HostAbortedException) + try { - throw; + Log.Information("Starting WinIn.FasterZ.Wms.AuthServer."); + var builder = WebApplication.CreateBuilder(args); + builder.Host.AddAppSettingsSecretsJson() + .UseAutofac() + .UseSerilog(); + await builder.AddApplicationAsync(); + var app = builder.Build(); + await app.InitializeApplicationAsync(); + await app.RunAsync(); + return 0; } + catch (Exception ex) + { + if (ex is HostAbortedException) + { + throw; + } - Log.Fatal(ex, "WinIn.FasterZ.Wms.AuthServer terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); + Log.Fatal(ex, "WinIn.FasterZ.Wms.AuthServer terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsAuthServerModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsAuthServerModule.cs index 15a7cfa1b..b1b7480cb 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsAuthServerModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsAuthServerModule.cs @@ -35,160 +35,161 @@ using Volo.Abp.UI.Navigation.Urls; using Volo.Abp.UI; using Volo.Abp.VirtualFileSystem; -namespace WinIn.FasterZ.Wms; - -[DependsOn( - typeof(AbpAutofacModule), - typeof(AbpCachingStackExchangeRedisModule), - typeof(AbpDistributedLockingModule), - typeof(AbpAccountWebOpenIddictModule), - typeof(AbpAccountApplicationModule), - typeof(AbpAccountHttpApiModule), - typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), - typeof(WmsEntityFrameworkCoreModule), - typeof(AbpAspNetCoreSerilogModule) - )] -public class WmsAuthServerModule : AbpModule +namespace WinIn.FasterZ.Wms { - public override void PreConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(AbpAutofacModule), + typeof(AbpCachingStackExchangeRedisModule), + typeof(AbpDistributedLockingModule), + typeof(AbpAccountWebOpenIddictModule), + typeof(AbpAccountApplicationModule), + typeof(AbpAccountHttpApiModule), + typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), + typeof(WmsEntityFrameworkCoreModule), + typeof(AbpAspNetCoreSerilogModule) + )] + public class WmsAuthServerModule : AbpModule { - PreConfigure(builder => + public override void PreConfigureServices(ServiceConfigurationContext context) { - builder.AddValidation(options => + PreConfigure(builder => { - options.AddAudiences("Wms"); - options.UseLocalServer(); - options.UseAspNetCore(); + builder.AddValidation(options => + { + options.AddAudiences("Wms"); + options.UseLocalServer(); + options.UseAspNetCore(); + }); }); - }); - } - - public override void ConfigureServices(ServiceConfigurationContext context) - { - var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.GetConfiguration(); + } - Configure(options => + public override void ConfigureServices(ServiceConfigurationContext context) { - options.Resources - .Get() - .AddBaseTypes( - typeof(AbpUiResource) - ); - }); + var hostingEnvironment = context.Services.GetHostingEnvironment(); + var configuration = context.Services.GetConfiguration(); - Configure(options => - { - options.StyleBundles.Configure( - LeptonXLiteThemeBundles.Styles.Global, - bundle => - { - bundle.AddFiles("/global-styles.css"); - } - ); - }); + Configure(options => + { + options.Resources + .Get() + .AddBaseTypes( + typeof(AbpUiResource) + ); + }); - Configure(options => - { - //options.IsEnabledForGetRequests = true; - options.ApplicationName = "AuthServer"; - }); + Configure(options => + { + options.StyleBundles.Configure( + LeptonXLiteThemeBundles.Styles.Global, + bundle => + { + bundle.AddFiles("/global-styles.css"); + } + ); + }); - if (hostingEnvironment.IsDevelopment()) - { - Configure(options => + Configure(options => { - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain.Shared")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain")); + //options.IsEnabledForGetRequests = true; + options.ApplicationName = "AuthServer"; }); - } - Configure(options => - { - options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; - options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? Array.Empty()); + if (hostingEnvironment.IsDevelopment()) + { + Configure(options => + { + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain.Shared")); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain")); + }); + } - options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"]; - options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password"; - }); + Configure(options => + { + options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; + options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? Array.Empty()); - Configure(options => - { - options.IsJobExecutionEnabled = false; - }); + options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"]; + options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password"; + }); - Configure(options => - { - options.KeyPrefix = "Wms:"; - }); + Configure(options => + { + options.IsJobExecutionEnabled = false; + }); - var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Wms"); - if (!hostingEnvironment.IsDevelopment()) - { - var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); - dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Wms-Protection-Keys"); - } + Configure(options => + { + options.KeyPrefix = "Wms:"; + }); - context.Services.AddSingleton(sp => - { - var connection = ConnectionMultiplexer - .Connect(configuration["Redis:Configuration"]); - return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); - }); + var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Wms"); + if (!hostingEnvironment.IsDevelopment()) + { + var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); + dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Wms-Protection-Keys"); + } - context.Services.AddCors(options => - { - options.AddDefaultPolicy(builder => + context.Services.AddSingleton(sp => { - builder - .WithOrigins( - configuration["App:CorsOrigins"]? - .Split(",", StringSplitOptions.RemoveEmptyEntries) - .Select(o => o.RemovePostFix("/")) - .ToArray() ?? Array.Empty() - ) - .WithAbpExposedHeaders() - .SetIsOriginAllowedToAllowWildcardSubdomains() - .AllowAnyHeader() - .AllowAnyMethod() - .AllowCredentials(); + var connection = ConnectionMultiplexer + .Connect(configuration["Redis:Configuration"]); + return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); }); - }); - } - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - var env = context.GetEnvironment(); + context.Services.AddCors(options => + { + options.AddDefaultPolicy(builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"]? + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() ?? Array.Empty() + ) + .WithAbpExposedHeaders() + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + } - if (env.IsDevelopment()) + public override void OnApplicationInitialization(ApplicationInitializationContext context) { - app.UseDeveloperExceptionPage(); - } + var app = context.GetApplicationBuilder(); + var env = context.GetEnvironment(); - app.UseAbpRequestLocalization(); + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } - if (!env.IsDevelopment()) - { - app.UseErrorPage(); - } + app.UseAbpRequestLocalization(); - app.UseCorrelationId(); - app.UseStaticFiles(); - app.UseRouting(); - app.UseCors(); - app.UseAuthentication(); - app.UseAbpOpenIddictValidation(); + if (!env.IsDevelopment()) + { + app.UseErrorPage(); + } - if (MultiTenancyConsts.IsEnabled) - { - app.UseMultiTenancy(); - } + app.UseCorrelationId(); + app.UseStaticFiles(); + app.UseRouting(); + app.UseCors(); + app.UseAuthentication(); + app.UseAbpOpenIddictValidation(); - app.UseUnitOfWork(); - app.UseAuthorization(); - app.UseAuditing(); - app.UseAbpSerilogEnrichers(); - app.UseConfiguredEndpoints(); + if (MultiTenancyConsts.IsEnabled) + { + app.UseMultiTenancy(); + } + + app.UseUnitOfWork(); + app.UseAuthorization(); + app.UseAuditing(); + app.UseAbpSerilogEnrichers(); + app.UseConfiguredEndpoints(); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsBrandingProvider.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsBrandingProvider.cs index 9d05fe73a..30188ed74 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsBrandingProvider.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.AuthServer/WmsBrandingProvider.cs @@ -1,10 +1,11 @@ using Volo.Abp.Ui.Branding; using Volo.Abp.DependencyInjection; -namespace WinIn.FasterZ.Wms; - -[Dependency(ReplaceServices = true)] -public class WmsBrandingProvider : DefaultBrandingProvider +namespace WinIn.FasterZ.Wms { - public override string AppName => "Wms"; + [Dependency(ReplaceServices = true)] + public class WmsBrandingProvider : DefaultBrandingProvider + { + public override string AppName => "Wms"; + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/DbMigratorHostedService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/DbMigratorHostedService.cs index c550bf4f2..6666044f8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/DbMigratorHostedService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/DbMigratorHostedService.cs @@ -8,44 +8,45 @@ using Serilog; using Volo.Abp; using Volo.Abp.Data; -namespace WinIn.FasterZ.Wms.DbMigrator; - -public class DbMigratorHostedService : IHostedService +namespace WinIn.FasterZ.Wms.DbMigrator { - private readonly IHostApplicationLifetime _hostApplicationLifetime; - private readonly IConfiguration _configuration; - - public DbMigratorHostedService(IHostApplicationLifetime hostApplicationLifetime, IConfiguration configuration) + public class DbMigratorHostedService : IHostedService { - _hostApplicationLifetime = hostApplicationLifetime; - _configuration = configuration; - } + private readonly IHostApplicationLifetime _hostApplicationLifetime; + private readonly IConfiguration _configuration; - public async Task StartAsync(CancellationToken cancellationToken) - { - using (var application = await AbpApplicationFactory.CreateAsync(options => + public DbMigratorHostedService(IHostApplicationLifetime hostApplicationLifetime, IConfiguration configuration) { - options.Services.ReplaceConfiguration(_configuration); - options.UseAutofac(); - options.Services.AddLogging(c => c.AddSerilog()); - options.AddDataMigrationEnvironment(); - })) - { - await application.InitializeAsync(); - - await application - .ServiceProvider - .GetRequiredService() - .MigrateAsync(); - - await application.ShutdownAsync(); + _hostApplicationLifetime = hostApplicationLifetime; + _configuration = configuration; + } - _hostApplicationLifetime.StopApplication(); + public async Task StartAsync(CancellationToken cancellationToken) + { + using (var application = await AbpApplicationFactory.CreateAsync(options => + { + options.Services.ReplaceConfiguration(_configuration); + options.UseAutofac(); + options.Services.AddLogging(c => c.AddSerilog()); + options.AddDataMigrationEnvironment(); + })) + { + await application.InitializeAsync(); + + await application + .ServiceProvider + .GetRequiredService() + .MigrateAsync(); + + await application.ShutdownAsync(); + + _hostApplicationLifetime.StopApplication(); + } } - } - public Task StopAsync(CancellationToken cancellationToken) - { - return Task.CompletedTask; + public Task StopAsync(CancellationToken cancellationToken) + { + return Task.CompletedTask; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/Program.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/Program.cs index c5c0c23f3..95950b435 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/Program.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/Program.cs @@ -7,35 +7,36 @@ using Microsoft.Extensions.Logging; using Serilog; using Serilog.Events; -namespace WinIn.FasterZ.Wms.DbMigrator; - -class Program +namespace WinIn.FasterZ.Wms.DbMigrator { - static async Task Main(string[] args) + class Program { - Log.Logger = new LoggerConfiguration() - .MinimumLevel.Information() - .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) - .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning) + static async Task Main(string[] args) + { + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Information() + .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) + .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning) #if DEBUG .MinimumLevel.Override("WinIn.FasterZ.Wms", LogEventLevel.Debug) #else .MinimumLevel.Override("WinIn.FasterZ.Wms", LogEventLevel.Information) #endif .Enrich.FromLogContext() - .WriteTo.Async(c => c.File("Logs/logs.txt")) - .WriteTo.Async(c => c.Console()) - .CreateLogger(); + .WriteTo.Async(c => c.File("Logs/logs.txt")) + .WriteTo.Async(c => c.Console()) + .CreateLogger(); - await CreateHostBuilder(args).RunConsoleAsync(); - } + await CreateHostBuilder(args).RunConsoleAsync(); + } - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .AddAppSettingsSecretsJson() - .ConfigureLogging((context, logging) => logging.ClearProviders()) - .ConfigureServices((hostContext, services) => - { - services.AddHostedService(); - }); + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .AddAppSettingsSecretsJson() + .ConfigureLogging((context, logging) => logging.ClearProviders()) + .ConfigureServices((hostContext, services) => + { + services.AddHostedService(); + }); + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/WmsDbMigratorModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/WmsDbMigratorModule.cs index 4e0e8e2d9..fd2efe4a1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/WmsDbMigratorModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.DbMigrator/WmsDbMigratorModule.cs @@ -4,18 +4,19 @@ using Volo.Abp.Caching; using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.Modularity; -namespace WinIn.FasterZ.Wms.DbMigrator; - -[DependsOn( - typeof(AbpAutofacModule), - typeof(AbpCachingStackExchangeRedisModule), - typeof(WmsEntityFrameworkCoreModule), - typeof(WmsApplicationContractsModule) - )] -public class WmsDbMigratorModule : AbpModule +namespace WinIn.FasterZ.Wms.DbMigrator { - public override void ConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(AbpAutofacModule), + typeof(AbpCachingStackExchangeRedisModule), + typeof(WmsEntityFrameworkCoreModule), + typeof(WmsApplicationContractsModule) + )] + public class WmsDbMigratorModule : AbpModule { - Configure(options => { options.KeyPrefix = "Wms:"; }); + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => { options.KeyPrefix = "Wms:"; }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Enums/Enum_ExportCustomUserSetting.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Enums/Enum_ExportCustomUserSetting.cs new file mode 100644 index 000000000..51d7c2aff --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Enums/Enum_ExportCustomUserSetting.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; + +namespace WinIn.FasterZ.Store.Enums +{ + public enum Enum_ExportCustomUserSetting + { + [Display(Name = "未定义")] + None=0, + [Display(Name = "导出")] + Yes=1, + [Display(Name = "不导出")] + No = 2 + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/WmsResource.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/WmsResource.cs index 04bb702f8..8d130f99f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/WmsResource.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/WmsResource.cs @@ -1,9 +1,10 @@ using Volo.Abp.Localization; -namespace WinIn.FasterZ.Wms.Localization; - -[LocalizationResourceName("Wms")] -public class WmsResource +namespace WinIn.FasterZ.Wms.Localization { + [LocalizationResourceName("Wms")] + public class WmsResource + { + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs index 786019175..6910c1872 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs @@ -1,10 +1,11 @@ -namespace WinIn.FasterZ.Wms.MultiTenancy; - -public static class MultiTenancyConsts +namespace WinIn.FasterZ.Wms.MultiTenancy { - /* Enable/disable multi-tenancy easily in a single point. - * If you will never need to multi-tenancy, you can remove - * related modules and code parts, including this file. - */ - public const bool IsEnabled = true; + public static class MultiTenancyConsts + { + /* Enable/disable multi-tenancy easily in a single point. + * If you will never need to multi-tenancy, you can remove + * related modules and code parts, including this file. + */ + public const bool IsEnabled = true; + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainErrorCodes.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainErrorCodes.cs index 41ca91e49..044ab75b9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainErrorCodes.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainErrorCodes.cs @@ -1,6 +1,7 @@ -namespace WinIn.FasterZ.Wms; - -public static class WmsDomainErrorCodes +namespace WinIn.FasterZ.Wms { - /* You can add your business exception error codes here, as constants */ + public static class WmsDomainErrorCodes + { + /* You can add your business exception error codes here, as constants */ + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainSharedModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainSharedModule.cs index ce9dffd7b..74d7f605c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainSharedModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsDomainSharedModule.cs @@ -13,46 +13,47 @@ using Volo.Abp.TenantManagement; using Volo.Abp.Validation.Localization; using Volo.Abp.VirtualFileSystem; -namespace WinIn.FasterZ.Wms; - -[DependsOn( - typeof(AbpAuditLoggingDomainSharedModule), - typeof(AbpBackgroundJobsDomainSharedModule), - typeof(AbpFeatureManagementDomainSharedModule), - typeof(AbpIdentityDomainSharedModule), - typeof(AbpOpenIddictDomainSharedModule), - typeof(AbpPermissionManagementDomainSharedModule), - typeof(AbpSettingManagementDomainSharedModule), - typeof(AbpTenantManagementDomainSharedModule) - )] -public class WmsDomainSharedModule : AbpModule +namespace WinIn.FasterZ.Wms { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - WmsGlobalFeatureConfigurator.Configure(); - WmsModuleExtensionConfigurator.Configure(); - } - - public override void ConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(AbpAuditLoggingDomainSharedModule), + typeof(AbpBackgroundJobsDomainSharedModule), + typeof(AbpFeatureManagementDomainSharedModule), + typeof(AbpIdentityDomainSharedModule), + typeof(AbpOpenIddictDomainSharedModule), + typeof(AbpPermissionManagementDomainSharedModule), + typeof(AbpSettingManagementDomainSharedModule), + typeof(AbpTenantManagementDomainSharedModule) + )] + public class WmsDomainSharedModule : AbpModule { - Configure(options => + public override void PreConfigureServices(ServiceConfigurationContext context) { - options.FileSets.AddEmbedded(); - }); + WmsGlobalFeatureConfigurator.Configure(); + WmsModuleExtensionConfigurator.Configure(); + } - Configure(options => + public override void ConfigureServices(ServiceConfigurationContext context) { - options.Resources - .Add("en") - .AddBaseTypes(typeof(AbpValidationResource)) - .AddVirtualJson("/Localization/Wms"); + Configure(options => + { + options.FileSets.AddEmbedded(); + }); - options.DefaultResourceType = typeof(WmsResource); - }); + Configure(options => + { + options.Resources + .Add("en") + .AddBaseTypes(typeof(AbpValidationResource)) + .AddVirtualJson("/Localization/Wms"); - Configure(options => - { - options.MapCodeNamespace("Wms", typeof(WmsResource)); - }); + options.DefaultResourceType = typeof(WmsResource); + }); + + Configure(options => + { + options.MapCodeNamespace("Wms", typeof(WmsResource)); + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsModuleExtensionConfigurator.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsModuleExtensionConfigurator.cs index ff02b6b30..647998ea8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsModuleExtensionConfigurator.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/WmsModuleExtensionConfigurator.cs @@ -3,71 +3,72 @@ using Volo.Abp.Identity; using Volo.Abp.ObjectExtending; using Volo.Abp.Threading; -namespace WinIn.FasterZ.Wms; - -public static class WmsModuleExtensionConfigurator +namespace WinIn.FasterZ.Wms { - private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); - - public static void Configure() + public static class WmsModuleExtensionConfigurator { - OneTimeRunner.Run(() => + private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); + + public static void Configure() { - ConfigureExistingProperties(); - ConfigureExtraProperties(); - }); - } + OneTimeRunner.Run(() => + { + ConfigureExistingProperties(); + ConfigureExtraProperties(); + }); + } - private static void ConfigureExistingProperties() - { - /* You can change max lengths for properties of the - * entities defined in the modules used by your application. - * - * Example: Change user and role name max lengths + private static void ConfigureExistingProperties() + { + /* You can change max lengths for properties of the + * entities defined in the modules used by your application. + * + * Example: Change user and role name max lengths - IdentityUserConsts.MaxNameLength = 99; - IdentityRoleConsts.MaxNameLength = 99; + IdentityUserConsts.MaxNameLength = 99; + IdentityRoleConsts.MaxNameLength = 99; - * Notice: It is not suggested to change property lengths - * unless you really need it. Go with the standard values wherever possible. - * - * If you are using EF Core, you will need to run the add-migration command after your changes. - */ - } + * Notice: It is not suggested to change property lengths + * unless you really need it. Go with the standard values wherever possible. + * + * If you are using EF Core, you will need to run the add-migration command after your changes. + */ + } - private static void ConfigureExtraProperties() - { - /* You can configure extra properties for the - * entities defined in the modules used by your application. - * - * This class can be used to define these extra properties - * with a high level, easy to use API. - * - * Example: Add a new property to the user entity of the identity module + private static void ConfigureExtraProperties() + { + /* You can configure extra properties for the + * entities defined in the modules used by your application. + * + * This class can be used to define these extra properties + * with a high level, easy to use API. + * + * Example: Add a new property to the user entity of the identity module - ObjectExtensionManager.Instance.Modules() - .ConfigureIdentity(identity => - { - identity.ConfigureUser(user => + ObjectExtensionManager.Instance.Modules() + .ConfigureIdentity(identity => { - user.AddOrUpdateProperty( //property type: string - "SocialSecurityNumber", //property name - property => - { - //validation rules - property.Attributes.Add(new RequiredAttribute()); - property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4}); - - property.Configuration[IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit] = true; + identity.ConfigureUser(user => + { + user.AddOrUpdateProperty( //property type: string + "SocialSecurityNumber", //property name + property => + { + //validation rules + property.Attributes.Add(new RequiredAttribute()); + property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4}); + + property.Configuration[IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit] = true; - //...other configurations for this property - } - ); + //...other configurations for this property + } + ); + }); }); - }); - * See the documentation for more: - * https://docs.abp.io/en/abp/latest/Module-Entity-Extensions - */ + * See the documentation for more: + * https://docs.abp.io/en/abp/latest/Module-Entity-Extensions + */ + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs new file mode 100644 index 000000000..3b384abb8 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs @@ -0,0 +1,43 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; +using WinIn.FasterZ.Store.Enums; + +namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting +{ + /// + /// 用户个型导出配置 + /// + public class ExportCustomUserSetting : AuditedAggregateRoot + { + /// + /// 用户ID + /// + [Display(Name = "用户ID")] + public Guid? ExportUserId { get; set; } + + /// + /// 用户姓名 + /// + [Display(Name = "用户姓名")] + public string? ExportUserName { get; set; } + + /// + /// 列名 + /// + [Display(Name = "列名")] + public string? ExportColumnName { get; set; } + + /// + /// 表名 + /// + [Display(Name = "表名")] + public string? ExportTableName { get; set; } + + /// + /// 导出设置项 + /// + [Display(Name = "导出设置项")] + public Enum_ExportCustomUserSetting CustomUserSetting { get; set; } + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs new file mode 100644 index 000000000..90249c3cf --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs @@ -0,0 +1,12 @@ +using System; +using Volo.Abp.Domain.Repositories; + +namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting +{ + /// + /// 用户个型导出配置 + /// + public interface IExportCustomUserSettingRepository : IRepository + { + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/IWmsDbSchemaMigrator.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/IWmsDbSchemaMigrator.cs index 9ab78db37..b757d3ad3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/IWmsDbSchemaMigrator.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/IWmsDbSchemaMigrator.cs @@ -1,8 +1,9 @@ using System.Threading.Tasks; -namespace WinIn.FasterZ.Wms.Data; - -public interface IWmsDbSchemaMigrator +namespace WinIn.FasterZ.Wms.Data { - Task MigrateAsync(); + public interface IWmsDbSchemaMigrator + { + Task MigrateAsync(); + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/NullWmsDbSchemaMigrator.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/NullWmsDbSchemaMigrator.cs index 17885a9f8..eaaa14cbb 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/NullWmsDbSchemaMigrator.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/NullWmsDbSchemaMigrator.cs @@ -1,15 +1,16 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; -namespace WinIn.FasterZ.Wms.Data; - -/* This is used if database provider does't define - * IWmsDbSchemaMigrator implementation. - */ -public class NullWmsDbSchemaMigrator : IWmsDbSchemaMigrator, ITransientDependency +namespace WinIn.FasterZ.Wms.Data { - public Task MigrateAsync() + /* This is used if database provider does't define + * IWmsDbSchemaMigrator implementation. + */ + public class NullWmsDbSchemaMigrator : IWmsDbSchemaMigrator, ITransientDependency { - return Task.CompletedTask; + public Task MigrateAsync() + { + return Task.CompletedTask; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/WmsDbMigrationService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/WmsDbMigrationService.cs index c2ae5ade9..fb0ce7a68 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/WmsDbMigrationService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Data/WmsDbMigrationService.cs @@ -13,206 +13,207 @@ using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; using Volo.Abp.TenantManagement; -namespace WinIn.FasterZ.Wms.Data; - -public class WmsDbMigrationService : ITransientDependency +namespace WinIn.FasterZ.Wms.Data { - public ILogger Logger { get; set; } - - private readonly IDataSeeder _dataSeeder; - private readonly IEnumerable _dbSchemaMigrators; - private readonly ITenantRepository _tenantRepository; - private readonly ICurrentTenant _currentTenant; - - public WmsDbMigrationService( - IDataSeeder dataSeeder, - IEnumerable dbSchemaMigrators, - ITenantRepository tenantRepository, - ICurrentTenant currentTenant) + public class WmsDbMigrationService : ITransientDependency { - _dataSeeder = dataSeeder; - _dbSchemaMigrators = dbSchemaMigrators; - _tenantRepository = tenantRepository; - _currentTenant = currentTenant; - - Logger = NullLogger.Instance; - } + public ILogger Logger { get; set; } + + private readonly IDataSeeder _dataSeeder; + private readonly IEnumerable _dbSchemaMigrators; + private readonly ITenantRepository _tenantRepository; + private readonly ICurrentTenant _currentTenant; + + public WmsDbMigrationService( + IDataSeeder dataSeeder, + IEnumerable dbSchemaMigrators, + ITenantRepository tenantRepository, + ICurrentTenant currentTenant) + { + _dataSeeder = dataSeeder; + _dbSchemaMigrators = dbSchemaMigrators; + _tenantRepository = tenantRepository; + _currentTenant = currentTenant; - public async Task MigrateAsync() - { - var initialMigrationAdded = AddInitialMigrationIfNotExist(); + Logger = NullLogger.Instance; + } - if (initialMigrationAdded) + public async Task MigrateAsync() { - return; - } + var initialMigrationAdded = AddInitialMigrationIfNotExist(); - Logger.LogInformation("Started database migrations..."); + if (initialMigrationAdded) + { + return; + } - await MigrateDatabaseSchemaAsync(); - await SeedDataAsync(); + Logger.LogInformation("Started database migrations..."); - Logger.LogInformation($"Successfully completed host database migrations."); + await MigrateDatabaseSchemaAsync(); + await SeedDataAsync(); - var tenants = await _tenantRepository.GetListAsync(includeDetails: true); + Logger.LogInformation($"Successfully completed host database migrations."); - var migratedDatabaseSchemas = new HashSet(); - foreach (var tenant in tenants) - { - using (_currentTenant.Change(tenant.Id)) + var tenants = await _tenantRepository.GetListAsync(includeDetails: true); + + var migratedDatabaseSchemas = new HashSet(); + foreach (var tenant in tenants) { - if (tenant.ConnectionStrings.Any()) + using (_currentTenant.Change(tenant.Id)) { - var tenantConnectionStrings = tenant.ConnectionStrings - .Select(x => x.Value) - .ToList(); - - if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings)) + if (tenant.ConnectionStrings.Any()) { - await MigrateDatabaseSchemaAsync(tenant); + var tenantConnectionStrings = tenant.ConnectionStrings + .Select(x => x.Value) + .ToList(); + + if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings)) + { + await MigrateDatabaseSchemaAsync(tenant); - migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings); + migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings); + } } + + await SeedDataAsync(tenant); } - await SeedDataAsync(tenant); + Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations."); } - Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations."); + Logger.LogInformation("Successfully completed all database migrations."); + Logger.LogInformation("You can safely end this process..."); } - Logger.LogInformation("Successfully completed all database migrations."); - Logger.LogInformation("You can safely end this process..."); - } - - private async Task MigrateDatabaseSchemaAsync(Tenant? tenant = null) - { - Logger.LogInformation( - $"Migrating schema for {(tenant == null ? "host" : tenant.Name + " tenant")} database..."); - - foreach (var migrator in _dbSchemaMigrators) + private async Task MigrateDatabaseSchemaAsync(Tenant? tenant = null) { - await migrator.MigrateAsync(); + Logger.LogInformation( + $"Migrating schema for {(tenant == null ? "host" : tenant.Name + " tenant")} database..."); + + foreach (var migrator in _dbSchemaMigrators) + { + await migrator.MigrateAsync(); + } } - } - private async Task SeedDataAsync(Tenant? tenant = null) - { - Logger.LogInformation($"Executing {(tenant == null ? "host" : tenant.Name + " tenant")} database seed..."); + private async Task SeedDataAsync(Tenant? tenant = null) + { + Logger.LogInformation($"Executing {(tenant == null ? "host" : tenant.Name + " tenant")} database seed..."); - await _dataSeeder.SeedAsync(new DataSeedContext(tenant?.Id) - .WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName, IdentityDataSeedContributor.AdminEmailDefaultValue) - .WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue) - ); - } + await _dataSeeder.SeedAsync(new DataSeedContext(tenant?.Id) + .WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName, IdentityDataSeedContributor.AdminEmailDefaultValue) + .WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue) + ); + } - private bool AddInitialMigrationIfNotExist() - { - try + private bool AddInitialMigrationIfNotExist() { - if (!DbMigrationsProjectExists()) + try + { + if (!DbMigrationsProjectExists()) + { + return false; + } + } + catch (Exception) { return false; } - } - catch (Exception) - { - return false; - } - try - { - if (!MigrationsFolderExists()) + try { - AddInitialMigration(); - return true; + if (!MigrationsFolderExists()) + { + AddInitialMigration(); + return true; + } + else + { + return false; + } } - else + catch (Exception e) { + Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message); return false; } } - catch (Exception e) - { - Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message); - return false; - } - } - - private bool DbMigrationsProjectExists() - { - var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath(); - return dbMigrationsProjectFolder != null; - } - - private bool MigrationsFolderExists() - { - var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath(); - return dbMigrationsProjectFolder != null && Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations")); - } - - private void AddInitialMigration() - { - Logger.LogInformation("Creating initial migration..."); + private bool DbMigrationsProjectExists() + { + var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath(); - string argumentPrefix; - string fileName; + return dbMigrationsProjectFolder != null; + } - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + private bool MigrationsFolderExists() { - argumentPrefix = "-c"; - fileName = "/bin/bash"; + var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath(); + return dbMigrationsProjectFolder != null && Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations")); } - else + + private void AddInitialMigration() { - argumentPrefix = "/C"; - fileName = "cmd.exe"; - } + Logger.LogInformation("Creating initial migration..."); - var procStartInfo = new ProcessStartInfo(fileName, - $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetEntityFrameworkCoreProjectFolderPath()}\"\"" - ); + string argumentPrefix; + string fileName; - try - { - Process.Start(procStartInfo); - } - catch (Exception) - { - throw new Exception("Couldn't run ABP CLI..."); - } - } + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + argumentPrefix = "-c"; + fileName = "/bin/bash"; + } + else + { + argumentPrefix = "/C"; + fileName = "cmd.exe"; + } - private string? GetEntityFrameworkCoreProjectFolderPath() - { - var slnDirectoryPath = GetSolutionDirectoryPath(); + var procStartInfo = new ProcessStartInfo(fileName, + $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetEntityFrameworkCoreProjectFolderPath()}\"\"" + ); - if (slnDirectoryPath == null) - { - throw new Exception("Solution folder not found!"); + try + { + Process.Start(procStartInfo); + } + catch (Exception) + { + throw new Exception("Couldn't run ABP CLI..."); + } } - var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src"); + private string? GetEntityFrameworkCoreProjectFolderPath() + { + var slnDirectoryPath = GetSolutionDirectoryPath(); - return Directory.GetDirectories(srcDirectoryPath) - .FirstOrDefault(d => d.EndsWith(".EntityFrameworkCore")); - } + if (slnDirectoryPath == null) + { + throw new Exception("Solution folder not found!"); + } - private string? GetSolutionDirectoryPath() - { - var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory()); + var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src"); + + return Directory.GetDirectories(srcDirectoryPath) + .FirstOrDefault(d => d.EndsWith(".EntityFrameworkCore")); + } - while (currentDirectory != null && Directory.GetParent(currentDirectory.FullName) != null) + private string? GetSolutionDirectoryPath() { - currentDirectory = Directory.GetParent(currentDirectory.FullName); + var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory()); - if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null) + while (currentDirectory != null && Directory.GetParent(currentDirectory.FullName) != null) { - return currentDirectory.FullName; + currentDirectory = Directory.GetParent(currentDirectory.FullName); + + if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null) + { + return currentDirectory.FullName; + } } - } - return null; + return null; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 0b24c1d33..ab1ae93c9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -16,400 +16,401 @@ using Volo.Abp.OpenIddict.Scopes; using Volo.Abp.PermissionManagement; using Volo.Abp.Uow; -namespace WinIn.FasterZ.Wms.OpenIddict; - -/* Creates initial data that is needed to property run the application - * and make client-to-server communication possible. - */ -public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDependency +namespace WinIn.FasterZ.Wms.OpenIddict { - private readonly IConfiguration _configuration; - private readonly IOpenIddictApplicationRepository _openIddictApplicationRepository; - private readonly IAbpApplicationManager _applicationManager; - private readonly IOpenIddictScopeRepository _openIddictScopeRepository; - private readonly IOpenIddictScopeManager _scopeManager; - private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IStringLocalizer L; - - public OpenIddictDataSeedContributor( - IConfiguration configuration, - IOpenIddictApplicationRepository openIddictApplicationRepository, - IAbpApplicationManager applicationManager, - IOpenIddictScopeRepository openIddictScopeRepository, - IOpenIddictScopeManager scopeManager, - IPermissionDataSeeder permissionDataSeeder, - IStringLocalizer l ) - { - _configuration = configuration; - _openIddictApplicationRepository = openIddictApplicationRepository; - _applicationManager = applicationManager; - _openIddictScopeRepository = openIddictScopeRepository; - _scopeManager = scopeManager; - _permissionDataSeeder = permissionDataSeeder; - L = l; - } - - [UnitOfWork] - public virtual async Task SeedAsync(DataSeedContext context) - { - await CreateScopesAsync(); - await CreateApplicationsAsync(); - } - - private async Task CreateScopesAsync() + /* Creates initial data that is needed to property run the application + * and make client-to-server communication possible. + */ + public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDependency { - if (await _openIddictScopeRepository.FindByNameAsync("Wms") == null) + private readonly IConfiguration _configuration; + private readonly IOpenIddictApplicationRepository _openIddictApplicationRepository; + private readonly IAbpApplicationManager _applicationManager; + private readonly IOpenIddictScopeRepository _openIddictScopeRepository; + private readonly IOpenIddictScopeManager _scopeManager; + private readonly IPermissionDataSeeder _permissionDataSeeder; + private readonly IStringLocalizer L; + + public OpenIddictDataSeedContributor( + IConfiguration configuration, + IOpenIddictApplicationRepository openIddictApplicationRepository, + IAbpApplicationManager applicationManager, + IOpenIddictScopeRepository openIddictScopeRepository, + IOpenIddictScopeManager scopeManager, + IPermissionDataSeeder permissionDataSeeder, + IStringLocalizer l ) { - await _scopeManager.CreateAsync(new OpenIddictScopeDescriptor { - Name = "Wms", DisplayName = "Wms API", Resources = { "Wms" } - }); + _configuration = configuration; + _openIddictApplicationRepository = openIddictApplicationRepository; + _applicationManager = applicationManager; + _openIddictScopeRepository = openIddictScopeRepository; + _scopeManager = scopeManager; + _permissionDataSeeder = permissionDataSeeder; + L = l; } - } - private async Task CreateApplicationsAsync() - { - var commonScopes = new List { - OpenIddictConstants.Permissions.Scopes.Address, - OpenIddictConstants.Permissions.Scopes.Email, - OpenIddictConstants.Permissions.Scopes.Phone, - OpenIddictConstants.Permissions.Scopes.Profile, - OpenIddictConstants.Permissions.Scopes.Roles, - "Wms" - }; - - var configurationSection = _configuration.GetSection("OpenIddict:Applications"); - - //Web Client - var webClientId = configurationSection["Wms_Web:ClientId"]; - if (!webClientId.IsNullOrWhiteSpace()) + [UnitOfWork] + public virtual async Task SeedAsync(DataSeedContext context) { - var webClientRootUrl = configurationSection["Wms_Web:RootUrl"].EnsureEndsWith('/'); - - /* Wms_Web client is only needed if you created a tiered - * solution. Otherwise, you can delete this client. */ - await CreateApplicationAsync( - name: webClientId!, - type: OpenIddictConstants.ClientTypes.Confidential, - consentType: OpenIddictConstants.ConsentTypes.Implicit, - displayName: "Web Application", - secret: configurationSection["Wms_Web:ClientSecret"] ?? "1q2w3e*", - grantTypes: new List //Hybrid flow - { - OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.Implicit - }, - scopes: commonScopes, - redirectUri: $"{webClientRootUrl}signin-oidc", - clientUri: webClientRootUrl, - postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc" - ); + await CreateScopesAsync(); + await CreateApplicationsAsync(); } - //Console Test / Angular Client - var consoleAndAngularClientId = configurationSection["Wms_App:ClientId"]; - if (!consoleAndAngularClientId.IsNullOrWhiteSpace()) + private async Task CreateScopesAsync() { - var consoleAndAngularClientRootUrl = configurationSection["Wms_App:RootUrl"]?.TrimEnd('/'); - await CreateApplicationAsync( - name: consoleAndAngularClientId!, - type: OpenIddictConstants.ClientTypes.Public, - consentType: OpenIddictConstants.ConsentTypes.Implicit, - displayName: "Console Test / Angular Application", - secret: null, - grantTypes: new List { - OpenIddictConstants.GrantTypes.AuthorizationCode, - OpenIddictConstants.GrantTypes.Password, - OpenIddictConstants.GrantTypes.ClientCredentials, - OpenIddictConstants.GrantTypes.RefreshToken - }, - scopes: commonScopes, - redirectUri: consoleAndAngularClientRootUrl, - clientUri: consoleAndAngularClientRootUrl, - postLogoutRedirectUri: consoleAndAngularClientRootUrl - ); - } - - // Blazor Client - var blazorClientId = configurationSection["Wms_Blazor:ClientId"]; - if (!blazorClientId.IsNullOrWhiteSpace()) - { - var blazorRootUrl = configurationSection["Wms_Blazor:RootUrl"]?.TrimEnd('/'); - - await CreateApplicationAsync( - name: blazorClientId!, - type: OpenIddictConstants.ClientTypes.Public, - consentType: OpenIddictConstants.ConsentTypes.Implicit, - displayName: "Blazor Application", - secret: null, - grantTypes: new List { OpenIddictConstants.GrantTypes.AuthorizationCode, }, - scopes: commonScopes, - redirectUri: $"{blazorRootUrl}/authentication/login-callback", - clientUri: blazorRootUrl, - postLogoutRedirectUri: $"{blazorRootUrl}/authentication/logout-callback" - ); - } - - // Blazor Server Tiered Client - var blazorServerTieredClientId = configurationSection["Wms_BlazorServerTiered:ClientId"]; - if (!blazorServerTieredClientId.IsNullOrWhiteSpace()) - { - var blazorServerTieredRootUrl = - configurationSection["Wms_BlazorServerTiered:RootUrl"].EnsureEndsWith('/'); - - await CreateApplicationAsync( - name: blazorServerTieredClientId!, - type: OpenIddictConstants.ClientTypes.Confidential, - consentType: OpenIddictConstants.ConsentTypes.Implicit, - displayName: "Blazor Server Application", - secret: configurationSection["Wms_BlazorServerTiered:ClientSecret"] ?? "1q2w3e*", - grantTypes: new List //Hybrid flow - { - OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.Implicit - }, - scopes: commonScopes, - redirectUri: $"{blazorServerTieredRootUrl}signin-oidc", - clientUri: blazorServerTieredRootUrl, - postLogoutRedirectUri: $"{blazorServerTieredRootUrl}signout-callback-oidc" - ); - } - - // Swagger Client - var swaggerClientId = configurationSection["Wms_Swagger:ClientId"]; - if (!swaggerClientId.IsNullOrWhiteSpace()) - { - var swaggerRootUrl = configurationSection["Wms_Swagger:RootUrl"]?.TrimEnd('/'); - - await CreateApplicationAsync( - name: swaggerClientId!, - type: OpenIddictConstants.ClientTypes.Public, - consentType: OpenIddictConstants.ConsentTypes.Implicit, - displayName: "Swagger Application", - secret: null, - grantTypes: new List { OpenIddictConstants.GrantTypes.AuthorizationCode, }, - scopes: commonScopes, - redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", - clientUri: swaggerRootUrl - ); - } - } - - private async Task CreateApplicationAsync( - [NotNull] string name, - [NotNull] string type, - [NotNull] string consentType, - string displayName, - string? secret, - List grantTypes, - List scopes, - string? clientUri = null, - string? redirectUri = null, - string? postLogoutRedirectUri = null, - List? permissions = null) - { - if (!string.IsNullOrEmpty(secret) && string.Equals(type, OpenIddictConstants.ClientTypes.Public, - StringComparison.OrdinalIgnoreCase)) - { - throw new BusinessException(L["NoClientSecretCanBeSetForPublicApplications"]); - } - - if (string.IsNullOrEmpty(secret) && string.Equals(type, OpenIddictConstants.ClientTypes.Confidential, - StringComparison.OrdinalIgnoreCase)) - { - throw new BusinessException(L["TheClientSecretIsRequiredForConfidentialApplications"]); - } - - var client = await _openIddictApplicationRepository.FindByClientIdAsync(name); - - var application = new AbpApplicationDescriptor { - ClientId = name, - Type = type, - ClientSecret = secret, - ConsentType = consentType, - DisplayName = displayName, - ClientUri = clientUri, - }; - - Check.NotNullOrEmpty(grantTypes, nameof(grantTypes)); - Check.NotNullOrEmpty(scopes, nameof(scopes)); - - if (new[] { OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.Implicit }.All( - grantTypes.Contains)) - { - application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken); - - if (string.Equals(type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase)) + if (await _openIddictScopeRepository.FindByNameAsync("Wms") == null) { - application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken); - application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeToken); + await _scopeManager.CreateAsync(new OpenIddictScopeDescriptor { + Name = "Wms", DisplayName = "Wms API", Resources = { "Wms" } + }); } } - if (!redirectUri.IsNullOrWhiteSpace() || !postLogoutRedirectUri.IsNullOrWhiteSpace()) + private async Task CreateApplicationsAsync() { - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Logout); - } - - var buildInGrantTypes = new[] { - OpenIddictConstants.GrantTypes.Implicit, OpenIddictConstants.GrantTypes.Password, - OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.ClientCredentials, - OpenIddictConstants.GrantTypes.DeviceCode, OpenIddictConstants.GrantTypes.RefreshToken - }; - - foreach (var grantType in grantTypes) - { - if (grantType == OpenIddictConstants.GrantTypes.AuthorizationCode) + var commonScopes = new List { + OpenIddictConstants.Permissions.Scopes.Address, + OpenIddictConstants.Permissions.Scopes.Email, + OpenIddictConstants.Permissions.Scopes.Phone, + OpenIddictConstants.Permissions.Scopes.Profile, + OpenIddictConstants.Permissions.Scopes.Roles, + "Wms" + }; + + var configurationSection = _configuration.GetSection("OpenIddict:Applications"); + + //Web Client + var webClientId = configurationSection["Wms_Web:ClientId"]; + if (!webClientId.IsNullOrWhiteSpace()) { - application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode); - application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Code); + var webClientRootUrl = configurationSection["Wms_Web:RootUrl"].EnsureEndsWith('/'); + + /* Wms_Web client is only needed if you created a tiered + * solution. Otherwise, you can delete this client. */ + await CreateApplicationAsync( + name: webClientId!, + type: OpenIddictConstants.ClientTypes.Confidential, + consentType: OpenIddictConstants.ConsentTypes.Implicit, + displayName: "Web Application", + secret: configurationSection["Wms_Web:ClientSecret"] ?? "1q2w3e*", + grantTypes: new List //Hybrid flow + { + OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.Implicit + }, + scopes: commonScopes, + redirectUri: $"{webClientRootUrl}signin-oidc", + clientUri: webClientRootUrl, + postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc" + ); } - if (grantType == OpenIddictConstants.GrantTypes.AuthorizationCode || - grantType == OpenIddictConstants.GrantTypes.Implicit) + //Console Test / Angular Client + var consoleAndAngularClientId = configurationSection["Wms_App:ClientId"]; + if (!consoleAndAngularClientId.IsNullOrWhiteSpace()) { - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Authorization); + var consoleAndAngularClientRootUrl = configurationSection["Wms_App:RootUrl"]?.TrimEnd('/'); + await CreateApplicationAsync( + name: consoleAndAngularClientId!, + type: OpenIddictConstants.ClientTypes.Public, + consentType: OpenIddictConstants.ConsentTypes.Implicit, + displayName: "Console Test / Angular Application", + secret: null, + grantTypes: new List { + OpenIddictConstants.GrantTypes.AuthorizationCode, + OpenIddictConstants.GrantTypes.Password, + OpenIddictConstants.GrantTypes.ClientCredentials, + OpenIddictConstants.GrantTypes.RefreshToken + }, + scopes: commonScopes, + redirectUri: consoleAndAngularClientRootUrl, + clientUri: consoleAndAngularClientRootUrl, + postLogoutRedirectUri: consoleAndAngularClientRootUrl + ); } - if (grantType == OpenIddictConstants.GrantTypes.AuthorizationCode || - grantType == OpenIddictConstants.GrantTypes.ClientCredentials || - grantType == OpenIddictConstants.GrantTypes.Password || - grantType == OpenIddictConstants.GrantTypes.RefreshToken || - grantType == OpenIddictConstants.GrantTypes.DeviceCode) + // Blazor Client + var blazorClientId = configurationSection["Wms_Blazor:ClientId"]; + if (!blazorClientId.IsNullOrWhiteSpace()) { - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection); + var blazorRootUrl = configurationSection["Wms_Blazor:RootUrl"]?.TrimEnd('/'); + + await CreateApplicationAsync( + name: blazorClientId!, + type: OpenIddictConstants.ClientTypes.Public, + consentType: OpenIddictConstants.ConsentTypes.Implicit, + displayName: "Blazor Application", + secret: null, + grantTypes: new List { OpenIddictConstants.GrantTypes.AuthorizationCode, }, + scopes: commonScopes, + redirectUri: $"{blazorRootUrl}/authentication/login-callback", + clientUri: blazorRootUrl, + postLogoutRedirectUri: $"{blazorRootUrl}/authentication/logout-callback" + ); } - if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) + // Blazor Server Tiered Client + var blazorServerTieredClientId = configurationSection["Wms_BlazorServerTiered:ClientId"]; + if (!blazorServerTieredClientId.IsNullOrWhiteSpace()) { - application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials); + var blazorServerTieredRootUrl = + configurationSection["Wms_BlazorServerTiered:RootUrl"].EnsureEndsWith('/'); + + await CreateApplicationAsync( + name: blazorServerTieredClientId!, + type: OpenIddictConstants.ClientTypes.Confidential, + consentType: OpenIddictConstants.ConsentTypes.Implicit, + displayName: "Blazor Server Application", + secret: configurationSection["Wms_BlazorServerTiered:ClientSecret"] ?? "1q2w3e*", + grantTypes: new List //Hybrid flow + { + OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.Implicit + }, + scopes: commonScopes, + redirectUri: $"{blazorServerTieredRootUrl}signin-oidc", + clientUri: blazorServerTieredRootUrl, + postLogoutRedirectUri: $"{blazorServerTieredRootUrl}signout-callback-oidc" + ); } - if (grantType == OpenIddictConstants.GrantTypes.Implicit) + // Swagger Client + var swaggerClientId = configurationSection["Wms_Swagger:ClientId"]; + if (!swaggerClientId.IsNullOrWhiteSpace()) { - application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Implicit); + var swaggerRootUrl = configurationSection["Wms_Swagger:RootUrl"]?.TrimEnd('/'); + + await CreateApplicationAsync( + name: swaggerClientId!, + type: OpenIddictConstants.ClientTypes.Public, + consentType: OpenIddictConstants.ConsentTypes.Implicit, + displayName: "Swagger Application", + secret: null, + grantTypes: new List { OpenIddictConstants.GrantTypes.AuthorizationCode, }, + scopes: commonScopes, + redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", + clientUri: swaggerRootUrl + ); } + } - if (grantType == OpenIddictConstants.GrantTypes.Password) + private async Task CreateApplicationAsync( + [NotNull] string name, + [NotNull] string type, + [NotNull] string consentType, + string displayName, + string? secret, + List grantTypes, + List scopes, + string? clientUri = null, + string? redirectUri = null, + string? postLogoutRedirectUri = null, + List? permissions = null) + { + if (!string.IsNullOrEmpty(secret) && string.Equals(type, OpenIddictConstants.ClientTypes.Public, + StringComparison.OrdinalIgnoreCase)) { - application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Password); + throw new BusinessException(L["NoClientSecretCanBeSetForPublicApplications"]); } - if (grantType == OpenIddictConstants.GrantTypes.RefreshToken) + if (string.IsNullOrEmpty(secret) && string.Equals(type, OpenIddictConstants.ClientTypes.Confidential, + StringComparison.OrdinalIgnoreCase)) { - application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); + throw new BusinessException(L["TheClientSecretIsRequiredForConfidentialApplications"]); } - if (grantType == OpenIddictConstants.GrantTypes.DeviceCode) + var client = await _openIddictApplicationRepository.FindByClientIdAsync(name); + + var application = new AbpApplicationDescriptor { + ClientId = name, + Type = type, + ClientSecret = secret, + ConsentType = consentType, + DisplayName = displayName, + ClientUri = clientUri, + }; + + Check.NotNullOrEmpty(grantTypes, nameof(grantTypes)); + Check.NotNullOrEmpty(scopes, nameof(scopes)); + + if (new[] { OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.Implicit }.All( + grantTypes.Contains)) { - application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.DeviceCode); - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Device); - } + application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken); - if (grantType == OpenIddictConstants.GrantTypes.Implicit) - { - application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken); if (string.Equals(type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase)) { - application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken); - application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Token); + application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken); + application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeToken); } } - if (!buildInGrantTypes.Contains(grantType)) + if (!redirectUri.IsNullOrWhiteSpace() || !postLogoutRedirectUri.IsNullOrWhiteSpace()) { - application.Permissions.Add(OpenIddictConstants.Permissions.Prefixes.GrantType + grantType); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Logout); } - } - var buildInScopes = new[] { - OpenIddictConstants.Permissions.Scopes.Address, OpenIddictConstants.Permissions.Scopes.Email, - OpenIddictConstants.Permissions.Scopes.Phone, OpenIddictConstants.Permissions.Scopes.Profile, - OpenIddictConstants.Permissions.Scopes.Roles - }; + var buildInGrantTypes = new[] { + OpenIddictConstants.GrantTypes.Implicit, OpenIddictConstants.GrantTypes.Password, + OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.ClientCredentials, + OpenIddictConstants.GrantTypes.DeviceCode, OpenIddictConstants.GrantTypes.RefreshToken + }; - foreach (var scope in scopes) - { - if (buildInScopes.Contains(scope)) + foreach (var grantType in grantTypes) { - application.Permissions.Add(scope); - } - else - { - application.Permissions.Add(OpenIddictConstants.Permissions.Prefixes.Scope + scope); + if (grantType == OpenIddictConstants.GrantTypes.AuthorizationCode) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode); + application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Code); + } + + if (grantType == OpenIddictConstants.GrantTypes.AuthorizationCode || + grantType == OpenIddictConstants.GrantTypes.Implicit) + { + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Authorization); + } + + if (grantType == OpenIddictConstants.GrantTypes.AuthorizationCode || + grantType == OpenIddictConstants.GrantTypes.ClientCredentials || + grantType == OpenIddictConstants.GrantTypes.Password || + grantType == OpenIddictConstants.GrantTypes.RefreshToken || + grantType == OpenIddictConstants.GrantTypes.DeviceCode) + { + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection); + } + + if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials); + } + + if (grantType == OpenIddictConstants.GrantTypes.Implicit) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Implicit); + } + + if (grantType == OpenIddictConstants.GrantTypes.Password) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Password); + } + + if (grantType == OpenIddictConstants.GrantTypes.RefreshToken) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); + } + + if (grantType == OpenIddictConstants.GrantTypes.DeviceCode) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.DeviceCode); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Device); + } + + if (grantType == OpenIddictConstants.GrantTypes.Implicit) + { + application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken); + if (string.Equals(type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase)) + { + application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken); + application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Token); + } + } + + if (!buildInGrantTypes.Contains(grantType)) + { + application.Permissions.Add(OpenIddictConstants.Permissions.Prefixes.GrantType + grantType); + } } - } - if (redirectUri != null) - { - if (!redirectUri.IsNullOrEmpty()) + var buildInScopes = new[] { + OpenIddictConstants.Permissions.Scopes.Address, OpenIddictConstants.Permissions.Scopes.Email, + OpenIddictConstants.Permissions.Scopes.Phone, OpenIddictConstants.Permissions.Scopes.Profile, + OpenIddictConstants.Permissions.Scopes.Roles + }; + + foreach (var scope in scopes) { - if (!Uri.TryCreate(redirectUri, UriKind.Absolute, out var uri) || !uri.IsWellFormedOriginalString()) + if (buildInScopes.Contains(scope)) { - throw new BusinessException(L["InvalidRedirectUri", redirectUri]); + application.Permissions.Add(scope); } - - if (application.RedirectUris.All(x => x != uri)) + else { - application.RedirectUris.Add(uri); + application.Permissions.Add(OpenIddictConstants.Permissions.Prefixes.Scope + scope); } } - } - if (postLogoutRedirectUri != null) - { - if (!postLogoutRedirectUri.IsNullOrEmpty()) + if (redirectUri != null) { - if (!Uri.TryCreate(postLogoutRedirectUri, UriKind.Absolute, out var uri) || - !uri.IsWellFormedOriginalString()) + if (!redirectUri.IsNullOrEmpty()) { - throw new BusinessException(L["InvalidPostLogoutRedirectUri", postLogoutRedirectUri]); + if (!Uri.TryCreate(redirectUri, UriKind.Absolute, out var uri) || !uri.IsWellFormedOriginalString()) + { + throw new BusinessException(L["InvalidRedirectUri", redirectUri]); + } + + if (application.RedirectUris.All(x => x != uri)) + { + application.RedirectUris.Add(uri); + } } + } - if (application.PostLogoutRedirectUris.All(x => x != uri)) + if (postLogoutRedirectUri != null) + { + if (!postLogoutRedirectUri.IsNullOrEmpty()) { - application.PostLogoutRedirectUris.Add(uri); + if (!Uri.TryCreate(postLogoutRedirectUri, UriKind.Absolute, out var uri) || + !uri.IsWellFormedOriginalString()) + { + throw new BusinessException(L["InvalidPostLogoutRedirectUri", postLogoutRedirectUri]); + } + + if (application.PostLogoutRedirectUris.All(x => x != uri)) + { + application.PostLogoutRedirectUris.Add(uri); + } } } - } - if (permissions != null) - { - await _permissionDataSeeder.SeedAsync( - ClientPermissionValueProvider.ProviderName, - name, - permissions, - null - ); - } + if (permissions != null) + { + await _permissionDataSeeder.SeedAsync( + ClientPermissionValueProvider.ProviderName, + name, + permissions, + null + ); + } - if (client == null) - { - await _applicationManager.CreateAsync(application); - return; - } + if (client == null) + { + await _applicationManager.CreateAsync(application); + return; + } - if (!HasSameRedirectUris(client, application)) - { - client.RedirectUris = JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/'))); - client.PostLogoutRedirectUris = JsonSerializer.Serialize(application.PostLogoutRedirectUris.Select(q => q.ToString().TrimEnd('/'))); + if (!HasSameRedirectUris(client, application)) + { + client.RedirectUris = JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/'))); + client.PostLogoutRedirectUris = JsonSerializer.Serialize(application.PostLogoutRedirectUris.Select(q => q.ToString().TrimEnd('/'))); + + await _applicationManager.UpdateAsync(client.ToModel()); + } - await _applicationManager.UpdateAsync(client.ToModel()); + if (!HasSameScopes(client, application)) + { + client.Permissions = JsonSerializer.Serialize(application.Permissions.Select(q => q.ToString())); + await _applicationManager.UpdateAsync(client.ToModel()); + } } - if (!HasSameScopes(client, application)) + private bool HasSameRedirectUris(OpenIddictApplication existingClient, AbpApplicationDescriptor application) { - client.Permissions = JsonSerializer.Serialize(application.Permissions.Select(q => q.ToString())); - await _applicationManager.UpdateAsync(client.ToModel()); + return existingClient.RedirectUris == JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/'))); } - } - private bool HasSameRedirectUris(OpenIddictApplication existingClient, AbpApplicationDescriptor application) - { - return existingClient.RedirectUris == JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/'))); - } - - private bool HasSameScopes(OpenIddictApplication existingClient, AbpApplicationDescriptor application) - { - return existingClient.Permissions == JsonSerializer.Serialize(application.Permissions.Select(q => q.ToString().TrimEnd('/'))); + private bool HasSameScopes(OpenIddictApplication existingClient, AbpApplicationDescriptor application) + { + return existingClient.Permissions == JsonSerializer.Serialize(application.Permissions.Select(q => q.ToString().TrimEnd('/'))); + } } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Settings/WmsSettingDefinitionProvider.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Settings/WmsSettingDefinitionProvider.cs index 4061fa43f..05fb82c53 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Settings/WmsSettingDefinitionProvider.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Settings/WmsSettingDefinitionProvider.cs @@ -1,12 +1,13 @@ using Volo.Abp.Settings; -namespace WinIn.FasterZ.Wms.Settings; - -public class WmsSettingDefinitionProvider : SettingDefinitionProvider +namespace WinIn.FasterZ.Wms.Settings { - public override void Define(ISettingDefinitionContext context) + public class WmsSettingDefinitionProvider : SettingDefinitionProvider { - //Define your own settings here. Example: - //context.Add(new SettingDefinition(WmsSettings.MySetting1)); + public override void Define(ISettingDefinitionContext context) + { + //Define your own settings here. Example: + //context.Add(new SettingDefinition(WmsSettings.MySetting1)); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs index 8c11d6088..c194292af 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs @@ -1,8 +1,9 @@ -namespace WinIn.FasterZ.Wms; - -public static class WmsConsts +namespace WinIn.FasterZ.Wms { - public const string DbTablePrefix = null; + public static class WmsConsts + { + public const string DbTablePrefix = null; - public const string DbSchema = null; + public const string DbSchema = null; + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsDomainModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsDomainModule.cs index 29f66fb00..91a028266 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsDomainModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsDomainModule.cs @@ -15,54 +15,55 @@ using Volo.Abp.PermissionManagement.OpenIddict; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; -namespace WinIn.FasterZ.Wms; - -[DependsOn( - typeof(WmsDomainSharedModule), - typeof(AbpAuditLoggingDomainModule), - typeof(AbpBackgroundJobsDomainModule), - typeof(AbpFeatureManagementDomainModule), - typeof(AbpIdentityDomainModule), - typeof(AbpOpenIddictDomainModule), - typeof(AbpPermissionManagementDomainOpenIddictModule), - typeof(AbpPermissionManagementDomainIdentityModule), - typeof(AbpSettingManagementDomainModule), - typeof(AbpTenantManagementDomainModule), - typeof(AbpEmailingModule) -)] -public class WmsDomainModule : AbpModule +namespace WinIn.FasterZ.Wms { - public override void ConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(WmsDomainSharedModule), + typeof(AbpAuditLoggingDomainModule), + typeof(AbpBackgroundJobsDomainModule), + typeof(AbpFeatureManagementDomainModule), + typeof(AbpIdentityDomainModule), + typeof(AbpOpenIddictDomainModule), + typeof(AbpPermissionManagementDomainOpenIddictModule), + typeof(AbpPermissionManagementDomainIdentityModule), + typeof(AbpSettingManagementDomainModule), + typeof(AbpTenantManagementDomainModule), + typeof(AbpEmailingModule) + )] + public class WmsDomainModule : AbpModule { - Configure(options => + public override void ConfigureServices(ServiceConfigurationContext context) { - options.Languages.Add(new LanguageInfo("ar", "ar", "العربية", "ae")); - options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština")); - options.Languages.Add(new LanguageInfo("en", "en", "English", "gb")); - options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); - options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); - options.Languages.Add(new LanguageInfo("hr", "hr", "Croatian")); - options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish", "fi")); - options.Languages.Add(new LanguageInfo("fr", "fr", "Français", "fr")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); - options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); - options.Languages.Add(new LanguageInfo("ru", "ru", "Русский", "ru")); - options.Languages.Add(new LanguageInfo("sk", "sk", "Slovak", "sk")); - options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe", "tr")); - options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); - options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文")); - options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de")); - options.Languages.Add(new LanguageInfo("es", "es", "Español")); - }); + Configure(options => + { + options.Languages.Add(new LanguageInfo("ar", "ar", "العربية", "ae")); + options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština")); + options.Languages.Add(new LanguageInfo("en", "en", "English", "gb")); + options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); + options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); + options.Languages.Add(new LanguageInfo("hr", "hr", "Croatian")); + options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish", "fi")); + options.Languages.Add(new LanguageInfo("fr", "fr", "Français", "fr")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); + options.Languages.Add(new LanguageInfo("ru", "ru", "Русский", "ru")); + options.Languages.Add(new LanguageInfo("sk", "sk", "Slovak", "sk")); + options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe", "tr")); + options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); + options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文")); + options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de")); + options.Languages.Add(new LanguageInfo("es", "es", "Español")); + }); - Configure(options => - { - options.IsEnabled = MultiTenancyConsts.IsEnabled; - }); + Configure(options => + { + options.IsEnabled = MultiTenancyConsts.IsEnabled; + }); #if DEBUG - context.Services.Replace(ServiceDescriptor.Singleton()); + context.Services.Replace(ServiceDescriptor.Singleton()); #endif + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs index c75285bb8..d5ed6448a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs @@ -1,18 +1,19 @@ -namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class AuthDepartment : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class AuthDepartment : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool? IsActive { get; set; } + public bool? IsActive { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/IAuthDepartmentRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/IAuthDepartmentRepository.cs index 2c9c743ca..c6ec78b8d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/IAuthDepartmentRepository.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/IAuthDepartmentRepository.cs @@ -1,9 +1,10 @@ -namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment +{ + using System; -using Volo.Abp.Domain.Repositories; + using Volo.Abp.Domain.Repositories; -public interface IAuthDepartmentRepository : IRepository -{ + public interface IAuthDepartmentRepository : IRepository + { + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthMenu/AuthMenu.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthMenu/AuthMenu.cs index 78296c76e..d999e20fd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthMenu/AuthMenu.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthMenu/AuthMenu.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.AuthMenu; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.AuthMenu +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class AuthMenu : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class AuthMenu : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Component { get; set; } + public string? Component { get; set; } - public string? CountUrl { get; set; } + public string? CountUrl { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public string? GroupName { get; set; } + public string? GroupName { get; set; } - public int GroupSort { get; set; } + public int GroupSort { get; set; } - public string? Icon { get; set; } + public string? Icon { get; set; } - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public string? ParentCode { get; set; } + public string? ParentCode { get; set; } - public string? Permission { get; set; } + public string? Permission { get; set; } - public string Portal { get; set; } = null!; + public string Portal { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Route { get; set; } + public string? Route { get; set; } - public int Sort { get; set; } + public int Sort { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserMenu/AuthUserMenu.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserMenu/AuthUserMenu.cs index da2170c43..57d68b705 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserMenu/AuthUserMenu.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserMenu/AuthUserMenu.cs @@ -1,14 +1,15 @@ -namespace WinIn.FasterZ.Wms.Z_Business.AuthUserMenu; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.AuthUserMenu +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class AuthUserMenu : AuditedAggregateRoot -{ - public string MenuCode { get; set; } = null!; + public class AuthUserMenu : AuditedAggregateRoot + { + public string MenuCode { get; set; } = null!; - public string Portal { get; set; } = null!; + public string Portal { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserWorkGroup/AuthUserWorkGroup.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserWorkGroup/AuthUserWorkGroup.cs index 20ec9fdc5..f88c179de 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserWorkGroup/AuthUserWorkGroup.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthUserWorkGroup/AuthUserWorkGroup.cs @@ -1,12 +1,13 @@ -namespace WinIn.FasterZ.Wms.Z_Business.AuthUserWorkGroup; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.AuthUserWorkGroup +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class AuthUserWorkGroup : AuditedAggregateRoot -{ - public string? Remark { get; set; } + public class AuthUserWorkGroup : AuditedAggregateRoot + { + public string? Remark { get; set; } - public string WorkGroupCode { get; set; } = null!; + public string WorkGroupCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataAql/BasedataAql.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataAql/BasedataAql.cs index 136fa5e09..5528a993c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataAql/BasedataAql.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataAql/BasedataAql.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataAql; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataAql +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataAql : AuditedAggregateRoot -{ - public string? AbcClass { get; set; } + public class BasedataAql : AuditedAggregateRoot + { + public string? AbcClass { get; set; } - public decimal CeilingQty { get; set; } + public decimal CeilingQty { get; set; } - public decimal FloorQty { get; set; } + public decimal FloorQty { get; set; } - public bool IsUsePercent { get; set; } + public bool IsUsePercent { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SamplePercent { get; set; } + public decimal SamplePercent { get; set; } - public decimal SampleQty { get; set; } + public decimal SampleQty { get; set; } - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataArea/BasedataArea.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataArea/BasedataArea.cs index 8b31227c5..62dbab0f2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataArea/BasedataArea.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataArea/BasedataArea.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataArea; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataArea +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataArea : AuditedAggregateRoot -{ - public string AreaType { get; set; } = null!; + public class BasedataArea : AuditedAggregateRoot + { + public string AreaType { get; set; } = null!; - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool IsFunctional { get; set; } + public bool IsFunctional { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataBom/BasedataBom.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataBom/BasedataBom.cs index 95a17e4dd..09a572235 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataBom/BasedataBom.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataBom/BasedataBom.cs @@ -1,34 +1,35 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataBom; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataBom +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataBom : AuditedAggregateRoot -{ - public DateTime? BeginTime { get; set; } + public class BasedataBom : AuditedAggregateRoot + { + public DateTime? BeginTime { get; set; } - public string Component { get; set; } = null!; + public string Component { get; set; } = null!; - public decimal ComponentQty { get; set; } + public decimal ComponentQty { get; set; } - public string? ComponentUom { get; set; } + public string? ComponentUom { get; set; } - public string DistributionType { get; set; } = null!; + public string DistributionType { get; set; } = null!; - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string? Erpop { get; set; } + public string? Erpop { get; set; } - public int Layer { get; set; } + public int Layer { get; set; } - public string? Mfgop { get; set; } + public string? Mfgop { get; set; } - public string PlannedSplitRule { get; set; } = null!; + public string PlannedSplitRule { get; set; } = null!; - public string Product { get; set; } = null!; + public string Product { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string TruncType { get; set; } = null!; + public string TruncType { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCalendar/BasedataCalendar.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCalendar/BasedataCalendar.cs index 655ab599e..896e7a853 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCalendar/BasedataCalendar.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCalendar/BasedataCalendar.cs @@ -1,18 +1,19 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataCalendar; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataCalendar +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataCalendar : AuditedAggregateRoot -{ - public DateTime? BeginTime { get; set; } + public class BasedataCalendar : AuditedAggregateRoot + { + public DateTime? BeginTime { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string? Module { get; set; } + public string? Module { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCategory/BasedataCategory.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCategory/BasedataCategory.cs index a02c98568..feb6cf8d1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCategory/BasedataCategory.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCategory/BasedataCategory.cs @@ -1,16 +1,17 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataCategory; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataCategory +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataCategory : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataCategory : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrency/BasedataCurrency.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrency/BasedataCurrency.cs index ccced604c..f862287a7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrency/BasedataCurrency.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrency/BasedataCurrency.cs @@ -1,18 +1,19 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataCurrency; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataCurrency +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataCurrency : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataCurrency : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool IsBasicCurrency { get; set; } + public bool IsBasicCurrency { get; set; } - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrencyExchange/BasedataCurrencyExchange.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrencyExchange/BasedataCurrencyExchange.cs index 6629b5e9e..832acc3fd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrencyExchange/BasedataCurrencyExchange.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCurrencyExchange/BasedataCurrencyExchange.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataCurrencyExchange; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataCurrencyExchange +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataCurrencyExchange : AuditedAggregateRoot -{ - public Guid BasicCurrencyId { get; set; } + public class BasedataCurrencyExchange : AuditedAggregateRoot + { + public Guid BasicCurrencyId { get; set; } - public Guid CurrencyId { get; set; } + public Guid CurrencyId { get; set; } - public DateTime EfficetiveTime { get; set; } + public DateTime EfficetiveTime { get; set; } - public DateTime ExpireTime { get; set; } + public DateTime ExpireTime { get; set; } - public decimal Rate { get; set; } + public decimal Rate { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomer/BasedataCustomer.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomer/BasedataCustomer.cs index c244c393f..2b90aab4b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomer/BasedataCustomer.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomer/BasedataCustomer.cs @@ -1,36 +1,37 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataCustomer; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataCustomer +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataCustomer : AuditedAggregateRoot -{ - public string? Address { get; set; } + public class BasedataCustomer : AuditedAggregateRoot + { + public string? Address { get; set; } - public string? City { get; set; } + public string? City { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? Contacts { get; set; } + public string? Contacts { get; set; } - public string? Country { get; set; } + public string? Country { get; set; } - public string? Currency { get; set; } + public string? Currency { get; set; } - public string? Fax { get; set; } + public string? Fax { get; set; } - public bool IsActive { get; set; } + public bool IsActive { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Phone { get; set; } + public string? Phone { get; set; } - public string? PostId { get; set; } + public string? PostId { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? ShortName { get; set; } + public string? ShortName { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerAddress/BasedataCustomerAddress.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerAddress/BasedataCustomerAddress.cs index 1a821fa0c..fdb4fc7de 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerAddress/BasedataCustomerAddress.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerAddress/BasedataCustomerAddress.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataCustomerAddress; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataCustomerAddress +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataCustomerAddress : AuditedAggregateRoot -{ - public string? Address { get; set; } + public class BasedataCustomerAddress : AuditedAggregateRoot + { + public string? Address { get; set; } - public string? City { get; set; } + public string? City { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? Contact { get; set; } + public string? Contact { get; set; } - public string CustomerCode { get; set; } = null!; + public string CustomerCode { get; set; } = null!; - public string? Desc { get; set; } + public string? Desc { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerItem/BasedataCustomerItem.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerItem/BasedataCustomerItem.cs index c7ef96d37..b0aa754b6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerItem/BasedataCustomerItem.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataCustomerItem/BasedataCustomerItem.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataCustomerItem; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataCustomerItem +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataCustomerItem : AuditedAggregateRoot -{ - public DateTime? BeginTime { get; set; } + public class BasedataCustomerItem : AuditedAggregateRoot + { + public DateTime? BeginTime { get; set; } - public string CustomerCode { get; set; } = null!; + public string CustomerCode { get; set; } = null!; - public string CustomerItemCode { get; set; } = null!; + public string CustomerItemCode { get; set; } = null!; - public decimal CustomerPackQty { get; set; } + public decimal CustomerPackQty { get; set; } - public string? CustomerPackUom { get; set; } + public string? CustomerPackUom { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Version { get; set; } + public string? Version { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDict/BasedataDict.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDict/BasedataDict.cs index 4e0156a5e..617b99656 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDict/BasedataDict.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDict/BasedataDict.cs @@ -1,21 +1,22 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataDict; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataDict +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.BasedataDictItem; + using WinIn.FasterZ.Wms.Z_Business.BasedataDictItem; -public class BasedataDict : AuditedAggregateRoot -{ - public virtual ICollection BasedataDictItems { get; set; } = new List(); + public class BasedataDict : AuditedAggregateRoot + { + public virtual ICollection BasedataDictItems { get; set; } = new List(); - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs index 50f3ddd10..23b74aa84 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataDictItem; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataDictItem +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.BasedataDict; + using WinIn.FasterZ.Wms.Z_Business.BasedataDict; -public class BasedataDictItem : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataDictItem : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool Enabled { get; set; } + public bool Enabled { get; set; } - public virtual BasedataDict Master { get; set; } = null!; + public virtual BasedataDict Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Value { get; set; } + public string? Value { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDock/BasedataDock.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDock/BasedataDock.cs index e82e9a813..f0d5c49e9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDock/BasedataDock.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDock/BasedataDock.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataDock; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataDock +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataDock : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataDock : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? DefaultLocationCode { get; set; } + public string? DefaultLocationCode { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDocumentSetting/BasedataDocumentSetting.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDocumentSetting/BasedataDocumentSetting.cs index 2997f74b7..1f368892b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDocumentSetting/BasedataDocumentSetting.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDocumentSetting/BasedataDocumentSetting.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataDocumentSetting; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataDocumentSetting +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataDocumentSetting : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataDocumentSetting : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? NumberFormat { get; set; } + public string? NumberFormat { get; set; } - public string? NumberPrefix { get; set; } + public string? NumberPrefix { get; set; } - public string? NumberSeparator { get; set; } + public string? NumberSeparator { get; set; } - public int NumberSerialLength { get; set; } + public int NumberSerialLength { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? TransactionType { get; set; } + public string? TransactionType { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataErpLocation/BasedataErpLocation.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataErpLocation/BasedataErpLocation.cs index d657c1c63..b645fd809 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataErpLocation/BasedataErpLocation.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataErpLocation/BasedataErpLocation.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataErpLocation; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataErpLocation +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataErpLocation : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataErpLocation : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Type { get; set; } + public string? Type { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataInterfaceCalendar/BasedataInterfaceCalendar.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataInterfaceCalendar/BasedataInterfaceCalendar.cs index e5041bf14..c6b0476ed 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataInterfaceCalendar/BasedataInterfaceCalendar.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataInterfaceCalendar/BasedataInterfaceCalendar.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataInterfaceCalendar; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataInterfaceCalendar +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataInterfaceCalendar : AuditedAggregateRoot -{ - public DateTime BeginTime { get; set; } + public class BasedataInterfaceCalendar : AuditedAggregateRoot + { + public DateTime BeginTime { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public DateTime ConvertToTime { get; set; } + public DateTime ConvertToTime { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public DateTime EndTime { get; set; } + public DateTime EndTime { get; set; } - public string Month { get; set; } = null!; + public string Month { get; set; } = null!; - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Year { get; set; } = null!; + public string Year { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemCategory/BasedataItemCategory.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemCategory/BasedataItemCategory.cs index d10cd603e..26f15e7d5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemCategory/BasedataItemCategory.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemCategory/BasedataItemCategory.cs @@ -1,16 +1,17 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemCategory; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemCategory +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataItemCategory : AuditedAggregateRoot -{ - public string CategoryCode { get; set; } = null!; + public class BasedataItemCategory : AuditedAggregateRoot + { + public string CategoryCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Value { get; set; } = null!; + public string Value { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemGuideBook/BasedataItemGuideBook.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemGuideBook/BasedataItemGuideBook.cs index 028129d0e..c04032c5e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemGuideBook/BasedataItemGuideBook.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemGuideBook/BasedataItemGuideBook.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemGuideBook; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemGuideBook +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataItemGuideBook : AuditedAggregateRoot -{ - public string? Desc1 { get; set; } + public class BasedataItemGuideBook : AuditedAggregateRoot + { + public string? Desc1 { get; set; } - public string? Desc2 { get; set; } + public string? Desc2 { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? Name { get; set; } + public string? Name { get; set; } - public string? PictureBlobName { get; set; } + public string? PictureBlobName { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Step { get; set; } + public string? Step { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemPack/BasedataItemPack.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemPack/BasedataItemPack.cs index 0c380b51a..3b2c0db24 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemPack/BasedataItemPack.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemPack/BasedataItemPack.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemPack; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemPack +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataItemPack : AuditedAggregateRoot -{ - public string? BasicUom { get; set; } + public class BasedataItemPack : AuditedAggregateRoot + { + public string? BasicUom { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string PackCode { get; set; } = null!; + public string PackCode { get; set; } = null!; - public string? PackName { get; set; } + public string? PackName { get; set; } - public string? PackType { get; set; } + public string? PackType { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemQuality/BasedataItemQuality.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemQuality/BasedataItemQuality.cs index 79a82abb1..824b85a2f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemQuality/BasedataItemQuality.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemQuality/BasedataItemQuality.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemQuality; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemQuality +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataItemQuality : AuditedAggregateRoot -{ - public string? Description { get; set; } + public class BasedataItemQuality : AuditedAggregateRoot + { + public string? Description { get; set; } - public string InspectType { get; set; } = null!; + public string InspectType { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemSafetyStock/BasedataItemSafetyStock.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemSafetyStock/BasedataItemSafetyStock.cs index b30e61c2c..709feac75 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemSafetyStock/BasedataItemSafetyStock.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemSafetyStock/BasedataItemSafetyStock.cs @@ -1,30 +1,31 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemSafetyStock; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemSafetyStock +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataItemSafetyStock : AuditedAggregateRoot -{ - public decimal FeedLine { get; set; } + public class BasedataItemSafetyStock : AuditedAggregateRoot + { + public decimal FeedLine { get; set; } - public decimal FeedQty { get; set; } + public decimal FeedQty { get; set; } - public string? FeedUm { get; set; } + public string? FeedUm { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public decimal MaxStock { get; set; } + public decimal MaxStock { get; set; } - public decimal MinStock { get; set; } + public decimal MinStock { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SafetyStock { get; set; } + public decimal SafetyStock { get; set; } - public string StoreRelationType { get; set; } = null!; + public string StoreRelationType { get; set; } = null!; - public string? StoreValue { get; set; } + public string? StoreValue { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemStoreRelation/BasedataItemStoreRelation.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemStoreRelation/BasedataItemStoreRelation.cs index 8e35b77bb..4fa90bd1a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemStoreRelation/BasedataItemStoreRelation.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataItemStoreRelation/BasedataItemStoreRelation.cs @@ -1,34 +1,35 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemStoreRelation; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataItemStoreRelation +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataItemStoreRelation : AuditedAggregateRoot -{ - public string? AltUm { get; set; } + public class BasedataItemStoreRelation : AuditedAggregateRoot + { + public string? AltUm { get; set; } - public decimal AltUmQty { get; set; } + public decimal AltUmQty { get; set; } - public bool Enabled { get; set; } + public bool Enabled { get; set; } - public bool IsFixed { get; set; } + public bool IsFixed { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public int MultiLoc { get; set; } + public int MultiLoc { get; set; } - public string PramaryUm { get; set; } = null!; + public string PramaryUm { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string StoreRelationType { get; set; } = null!; + public string StoreRelationType { get; set; } = null!; - public string? StoreUm { get; set; } + public string? StoreUm { get; set; } - public string? StoreValue { get; set; } + public string? StoreValue { get; set; } - public decimal UmQty { get; set; } + public decimal UmQty { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocation/BasedataLocation.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocation/BasedataLocation.cs index b3ce990e0..496cf62d5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocation/BasedataLocation.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocation/BasedataLocation.cs @@ -1,72 +1,73 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataLocation; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataLocation +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataLocation : AuditedAggregateRoot -{ - public string AreaCode { get; set; } = null!; + public class BasedataLocation : AuditedAggregateRoot + { + public string AreaCode { get; set; } = null!; - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public int ColumnCode { get; set; } + public int ColumnCode { get; set; } - public string DefaultInventoryStatus { get; set; } = null!; + public string DefaultInventoryStatus { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool? EnableBreakStore { get; set; } + public bool? EnableBreakStore { get; set; } - public bool? EnableKeepZero { get; set; } + public bool? EnableKeepZero { get; set; } - public bool? EnableMixItem { get; set; } + public bool? EnableMixItem { get; set; } - public bool? EnableMixLot { get; set; } + public bool? EnableMixLot { get; set; } - public bool? EnableMixStatus { get; set; } + public bool? EnableMixStatus { get; set; } - public bool? EnableNegative { get; set; } + public bool? EnableNegative { get; set; } - public bool? EnableOpportunityCount { get; set; } + public bool? EnableOpportunityCount { get; set; } - public bool? EnableOverPick { get; set; } + public bool? EnableOverPick { get; set; } - public bool? EnablePick { get; set; } + public bool? EnablePick { get; set; } - public bool? EnableReceive { get; set; } + public bool? EnableReceive { get; set; } - public bool? EnableReturnFromCustomer { get; set; } + public bool? EnableReturnFromCustomer { get; set; } - public bool? EnableReturnToSupplier { get; set; } + public bool? EnableReturnToSupplier { get; set; } - public bool? EnableShip { get; set; } + public bool? EnableShip { get; set; } - public bool? EnableSplitBox { get; set; } + public bool? EnableSplitBox { get; set; } - public bool? EnableSplitPallet { get; set; } + public bool? EnableSplitPallet { get; set; } - public bool? EnableWholeStore { get; set; } + public bool? EnableWholeStore { get; set; } - public string ErpLocationCode { get; set; } = null!; + public string ErpLocationCode { get; set; } = null!; - public string LocationGroupCode { get; set; } = null!; + public string LocationGroupCode { get; set; } = null!; - public string? Name { get; set; } + public string? Name { get; set; } - public int PickOrder { get; set; } + public int PickOrder { get; set; } - public int PickPriority { get; set; } + public int PickPriority { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public int RowCode { get; set; } + public int RowCode { get; set; } - public string? ShelfCode { get; set; } + public string? ShelfCode { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; - public string WorkGroupCode { get; set; } = null!; + public string WorkGroupCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocationGroup/BasedataLocationGroup.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocationGroup/BasedataLocationGroup.cs index 2fd6106a4..88aa6590a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocationGroup/BasedataLocationGroup.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataLocationGroup/BasedataLocationGroup.cs @@ -1,60 +1,61 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataLocationGroup; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataLocationGroup +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataLocationGroup : AuditedAggregateRoot -{ - public string AreaCode { get; set; } = null!; + public class BasedataLocationGroup : AuditedAggregateRoot + { + public string AreaCode { get; set; } = null!; - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string DefaultInventoryStatus { get; set; } = null!; + public string DefaultInventoryStatus { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool? EnableBreakStore { get; set; } + public bool? EnableBreakStore { get; set; } - public bool? EnableKeepZero { get; set; } + public bool? EnableKeepZero { get; set; } - public bool? EnableMixItem { get; set; } + public bool? EnableMixItem { get; set; } - public bool? EnableMixLot { get; set; } + public bool? EnableMixLot { get; set; } - public bool? EnableMixStatus { get; set; } + public bool? EnableMixStatus { get; set; } - public bool? EnableNegative { get; set; } + public bool? EnableNegative { get; set; } - public bool? EnableOpportunityCount { get; set; } + public bool? EnableOpportunityCount { get; set; } - public bool? EnableOverPick { get; set; } + public bool? EnableOverPick { get; set; } - public bool? EnablePick { get; set; } + public bool? EnablePick { get; set; } - public bool? EnableReceive { get; set; } + public bool? EnableReceive { get; set; } - public bool? EnableReturnFromCustomer { get; set; } + public bool? EnableReturnFromCustomer { get; set; } - public bool? EnableReturnToSupplier { get; set; } + public bool? EnableReturnToSupplier { get; set; } - public bool? EnableShip { get; set; } + public bool? EnableShip { get; set; } - public bool? EnableSplitBox { get; set; } + public bool? EnableSplitBox { get; set; } - public bool? EnableSplitPallet { get; set; } + public bool? EnableSplitPallet { get; set; } - public bool? EnableWholeStore { get; set; } + public bool? EnableWholeStore { get; set; } - public string GroupType { get; set; } = null!; + public string GroupType { get; set; } = null!; - public string? Name { get; set; } + public string? Name { get; set; } - public string? OverflowLocationGroup { get; set; } + public string? OverflowLocationGroup { get; set; } - public int PickPriority { get; set; } + public int PickPriority { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataMachine/BasedataMachine.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataMachine/BasedataMachine.cs index 846b410c5..a4579883c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataMachine/BasedataMachine.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataMachine/BasedataMachine.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataMachine; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataMachine +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataMachine : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataMachine : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public Guid ProdLineId { get; set; } + public Guid ProdLineId { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public Guid WorkStationId { get; set; } + public Guid WorkStationId { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLine/BasedataProductionLine.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLine/BasedataProductionLine.cs index 8ac1d588d..86ebdb260 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLine/BasedataProductionLine.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLine/BasedataProductionLine.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataProductionLine; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataProductionLine +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataProductionLine : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataProductionLine : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? ProductLocationCode { get; set; } + public string? ProductLocationCode { get; set; } - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public string? RawLocationGroupCode { get; set; } + public string? RawLocationGroupCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? WorkshopCode { get; set; } + public string? WorkshopCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLineItem/BasedataProductionLineItem.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLineItem/BasedataProductionLineItem.cs index 325d3174d..4fc99eb06 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLineItem/BasedataProductionLineItem.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProductionLineItem/BasedataProductionLineItem.cs @@ -1,14 +1,15 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataProductionLineItem; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataProductionLineItem +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataProductionLineItem : AuditedAggregateRoot -{ - public string ItemCode { get; set; } = null!; + public class BasedataProductionLineItem : AuditedAggregateRoot + { + public string ItemCode { get; set; } = null!; - public string ProdLineCode { get; set; } = null!; + public string ProdLineCode { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProject/BasedataProject.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProject/BasedataProject.cs index f3ad86e4d..14c9b2f95 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProject/BasedataProject.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataProject/BasedataProject.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataProject; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataProject +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataProject : AuditedAggregateRoot -{ - public DateTime? BeginTime { get; set; } + public class BasedataProject : AuditedAggregateRoot + { + public DateTime? BeginTime { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? CustomerCode { get; set; } + public string? CustomerCode { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataPurchasePriceSheet/BasedataPurchasePriceSheet.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataPurchasePriceSheet/BasedataPurchasePriceSheet.cs index 36ff71f7f..380a37370 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataPurchasePriceSheet/BasedataPurchasePriceSheet.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataPurchasePriceSheet/BasedataPurchasePriceSheet.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataPurchasePriceSheet; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataPurchasePriceSheet +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataPurchasePriceSheet : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataPurchasePriceSheet : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public Guid CurrencyId { get; set; } + public Guid CurrencyId { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public Guid SupplierId { get; set; } + public Guid SupplierId { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSalePriceSheet/BasedataSalePriceSheet.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSalePriceSheet/BasedataSalePriceSheet.cs index 641bcb2f9..18569c8ce 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSalePriceSheet/BasedataSalePriceSheet.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSalePriceSheet/BasedataSalePriceSheet.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataSalePriceSheet; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataSalePriceSheet +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataSalePriceSheet : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataSalePriceSheet : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public Guid CurrencyId { get; set; } + public Guid CurrencyId { get; set; } - public Guid CustomerId { get; set; } + public Guid CustomerId { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataShift/BasedataShift.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataShift/BasedataShift.cs index 08e38fbcc..9e8786346 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataShift/BasedataShift.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataShift/BasedataShift.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataShift; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataShift +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataShift : AuditedAggregateRoot -{ - public DateTime? BeginTime { get; set; } + public class BasedataShift : AuditedAggregateRoot + { + public DateTime? BeginTime { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool EndAtNextDay { get; set; } + public bool EndAtNextDay { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataStdCostPriceSheet/BasedataStdCostPriceSheet.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataStdCostPriceSheet/BasedataStdCostPriceSheet.cs index ea19fcfa6..ed9ef555b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataStdCostPriceSheet/BasedataStdCostPriceSheet.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataStdCostPriceSheet/BasedataStdCostPriceSheet.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataStdCostPriceSheet; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataStdCostPriceSheet +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataStdCostPriceSheet : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataStdCostPriceSheet : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public Guid CurrencyId { get; set; } + public Guid CurrencyId { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public Guid SupplierId { get; set; } + public Guid SupplierId { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplier/BasedataSupplier.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplier/BasedataSupplier.cs index ac2b8edf3..70362a8f2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplier/BasedataSupplier.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplier/BasedataSupplier.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataSupplier; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataSupplier +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataSupplier : AuditedAggregateRoot -{ - public string? Address { get; set; } + public class BasedataSupplier : AuditedAggregateRoot + { + public string? Address { get; set; } - public string? Bank { get; set; } + public string? Bank { get; set; } - public string? City { get; set; } + public string? City { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? Contacts { get; set; } + public string? Contacts { get; set; } - public string? Country { get; set; } + public string? Country { get; set; } - public string? Currency { get; set; } + public string? Currency { get; set; } - public string? Fax { get; set; } + public string? Fax { get; set; } - public bool? IsActive { get; set; } + public bool? IsActive { get; set; } - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public string? Phone { get; set; } + public string? Phone { get; set; } - public string? PostId { get; set; } + public string? PostId { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? ShortName { get; set; } + public string? ShortName { get; set; } - public decimal TaxRate { get; set; } + public decimal TaxRate { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierItem/BasedataSupplierItem.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierItem/BasedataSupplierItem.cs index 3b4d917e5..295c262f5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierItem/BasedataSupplierItem.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierItem/BasedataSupplierItem.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataSupplierItem; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataSupplierItem +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataSupplierItem : AuditedAggregateRoot -{ - public string ItemCode { get; set; } = null!; + public class BasedataSupplierItem : AuditedAggregateRoot + { + public string ItemCode { get; set; } = null!; - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public decimal QtyPerPallet { get; set; } + public decimal QtyPerPallet { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string SupplierItemCode { get; set; } = null!; + public string SupplierItemCode { get; set; } = null!; - public decimal SupplierPackQty { get; set; } + public decimal SupplierPackQty { get; set; } - public string? SupplierPackUom { get; set; } + public string? SupplierPackUom { get; set; } - public string? SupplierSimpleName { get; set; } + public string? SupplierSimpleName { get; set; } - public string? Version { get; set; } + public string? Version { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierTimeWindow/BasedataSupplierTimeWindow.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierTimeWindow/BasedataSupplierTimeWindow.cs index 71e6bf202..9558a24d2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierTimeWindow/BasedataSupplierTimeWindow.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataSupplierTimeWindow/BasedataSupplierTimeWindow.cs @@ -1,18 +1,19 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataSupplierTimeWindow; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataSupplierTimeWindow +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataSupplierTimeWindow : AuditedAggregateRoot -{ - public string? Remark { get; set; } + public class BasedataSupplierTimeWindow : AuditedAggregateRoot + { + public string? Remark { get; set; } - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string SupplierName { get; set; } = null!; + public string SupplierName { get; set; } = null!; - public string TimeSlot { get; set; } = null!; + public string TimeSlot { get; set; } = null!; - public string Week { get; set; } = null!; + public string Week { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTeam/BasedataTeam.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTeam/BasedataTeam.cs index 6f5073277..bfbeff86c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTeam/BasedataTeam.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTeam/BasedataTeam.cs @@ -1,18 +1,19 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataTeam; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataTeam +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataTeam : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataTeam : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Members { get; set; } + public string? Members { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTransactionType/BasedataTransactionType.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTransactionType/BasedataTransactionType.cs index c303654e8..5c11576de 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTransactionType/BasedataTransactionType.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataTransactionType/BasedataTransactionType.cs @@ -1,44 +1,45 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataTransactionType; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataTransactionType +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataTransactionType : AuditedAggregateRoot -{ - public bool AutoAgreeRequest { get; set; } + public class BasedataTransactionType : AuditedAggregateRoot + { + public bool AutoAgreeRequest { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandleRequest { get; set; } + public bool AutoHandleRequest { get; set; } - public bool AutoSubmitRequest { get; set; } + public bool AutoSubmitRequest { get; set; } - public string Description { get; set; } = null!; + public string Description { get; set; } = null!; - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public bool Enabled { get; set; } + public bool Enabled { get; set; } - public string? InInventoryStatuses { get; set; } + public string? InInventoryStatuses { get; set; } - public string? InLocationAreas { get; set; } + public string? InLocationAreas { get; set; } - public string? InLocationTypes { get; set; } + public string? InLocationTypes { get; set; } - public string? ItemStatuses { get; set; } + public string? ItemStatuses { get; set; } - public string? ItemTypes { get; set; } + public string? ItemTypes { get; set; } - public string? OutInventoryStatuses { get; set; } + public string? OutInventoryStatuses { get; set; } - public string? OutLocationAreas { get; set; } + public string? OutLocationAreas { get; set; } - public string? OutLocationTypes { get; set; } + public string? OutLocationTypes { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string TransSubType { get; set; } = null!; + public string TransSubType { get; set; } = null!; - public string TransType { get; set; } = null!; + public string TransType { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataUom/BasedataUom.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataUom/BasedataUom.cs index 976f8be00..1541d4297 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataUom/BasedataUom.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataUom/BasedataUom.cs @@ -1,18 +1,19 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataUom; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataUom +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataUom : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataUom : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWarehouse/BasedataWarehouse.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWarehouse/BasedataWarehouse.cs index c5137721e..637e753e6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWarehouse/BasedataWarehouse.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWarehouse/BasedataWarehouse.cs @@ -1,16 +1,17 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataWarehouse; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataWarehouse +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataWarehouse : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataWarehouse : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkGroup/BasedataWorkGroup.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkGroup/BasedataWorkGroup.cs index 4175aef22..510615154 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkGroup/BasedataWorkGroup.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkGroup/BasedataWorkGroup.cs @@ -1,18 +1,19 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataWorkGroup; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataWorkGroup +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataWorkGroup : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataWorkGroup : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkShop/BasedataWorkShop.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkShop/BasedataWorkShop.cs index e90db9128..97dd0ba48 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkShop/BasedataWorkShop.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkShop/BasedataWorkShop.cs @@ -1,16 +1,17 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataWorkShop; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataWorkShop +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataWorkShop : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataWorkShop : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkStation/BasedataWorkStation.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkStation/BasedataWorkStation.cs index 2decadcc1..f34c16f53 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkStation/BasedataWorkStation.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataWorkStation/BasedataWorkStation.cs @@ -1,24 +1,25 @@ -namespace WinIn.FasterZ.Wms.Z_Business.BasedataWorkStation; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.BasedataWorkStation +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class BasedataWorkStation : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class BasedataWorkStation : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string Name { get; set; } = null!; + public string Name { get; set; } = null!; - public string ProductionLineCode { get; set; } = null!; + public string ProductionLineCode { get; set; } = null!; - public string? ProductLocationCode { get; set; } + public string? ProductLocationCode { get; set; } - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Type { get; set; } + public string? Type { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataExportTask/FileStorageDataExportTask.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataExportTask/FileStorageDataExportTask.cs index daff22dad..779af2544 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataExportTask/FileStorageDataExportTask.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataExportTask/FileStorageDataExportTask.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.FileStorageDataExportTask; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.FileStorageDataExportTask +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class FileStorageDataExportTask : AuditedAggregateRoot -{ - public DateTime? BeginTime { get; set; } + public class FileStorageDataExportTask : AuditedAggregateRoot + { + public DateTime? BeginTime { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string? ExportFileBlobName { get; set; } + public string? ExportFileBlobName { get; set; } - public string Function { get; set; } = null!; + public string Function { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestParam { get; set; } + public string? RequestParam { get; set; } - public string? ReturnResult { get; set; } + public string? ReturnResult { get; set; } - public string Route { get; set; } = null!; + public string Route { get; set; } = null!; - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataImportTask/FileStorageDataImportTask.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataImportTask/FileStorageDataImportTask.cs index 648a74d58..41ac8070b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataImportTask/FileStorageDataImportTask.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageDataImportTask/FileStorageDataImportTask.cs @@ -1,32 +1,33 @@ -namespace WinIn.FasterZ.Wms.Z_Business.FileStorageDataImportTask; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.FileStorageDataImportTask +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class FileStorageDataImportTask : AuditedAggregateRoot -{ - public DateTime? BeginTime { get; set; } + public class FileStorageDataImportTask : AuditedAggregateRoot + { + public DateTime? BeginTime { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string Function { get; set; } = null!; + public string Function { get; set; } = null!; - public string ImportFileBlobName { get; set; } = null!; + public string ImportFileBlobName { get; set; } = null!; - public string? ImportReportBlobName { get; set; } + public string? ImportReportBlobName { get; set; } - public int ImportStatus { get; set; } + public int ImportStatus { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestParam { get; set; } + public string? RequestParam { get; set; } - public string? ReturnResult { get; set; } + public string? ReturnResult { get; set; } - public string Route { get; set; } = null!; + public string Route { get; set; } = null!; - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageFile/FileStorageFile.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageFile/FileStorageFile.cs index b2ca34844..38f6c4eb4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageFile/FileStorageFile.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/FileStorageFile/FileStorageFile.cs @@ -1,16 +1,17 @@ -namespace WinIn.FasterZ.Wms.Z_Business.FileStorageFile; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.FileStorageFile +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class FileStorageFile : AuditedAggregateRoot -{ - public string BlobName { get; set; } = null!; + public class FileStorageFile : AuditedAggregateRoot + { + public string BlobName { get; set; } = null!; - public long ByteSize { get; set; } + public long ByteSize { get; set; } - public string FileName { get; set; } = null!; + public string FileName { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalance/InventoryBalance.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalance/InventoryBalance.cs index 16831ecdd..1d54949fe 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalance/InventoryBalance.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalance/InventoryBalance.cs @@ -1,68 +1,69 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryBalance; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryBalance +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryBalance : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class InventoryBalance : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public bool? IsActive { get; set; } + public bool? IsActive { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LastCountLabel { get; set; } + public string? LastCountLabel { get; set; } - public string? LastCountPlanNumber { get; set; } + public string? LastCountPlanNumber { get; set; } - public DateTime LastCountTime { get; set; } + public DateTime LastCountTime { get; set; } - public string? LastTransNumber { get; set; } + public string? LastTransNumber { get; set; } - public string LastTransType { get; set; } = null!; + public string LastTransType { get; set; } = null!; - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public string ManageType { get; set; } = null!; + public string ManageType { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public DateTime PutInTime { get; set; } + public DateTime PutInTime { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SerialNumber { get; set; } + public string? SerialNumber { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalanceCopy/InventoryBalanceCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalanceCopy/InventoryBalanceCopy.cs index 8f0406f33..6e4e239c9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalanceCopy/InventoryBalanceCopy.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryBalanceCopy/InventoryBalanceCopy.cs @@ -1,68 +1,69 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryBalanceCopy; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryBalanceCopy +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryBalanceCopy : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class InventoryBalanceCopy : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public bool? IsActive { get; set; } + public bool? IsActive { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LastCountLabel { get; set; } + public string? LastCountLabel { get; set; } - public string? LastCountPlanNumber { get; set; } + public string? LastCountPlanNumber { get; set; } - public DateTime LastCountTime { get; set; } + public DateTime LastCountTime { get; set; } - public string? LastTransNumber { get; set; } + public string? LastTransNumber { get; set; } - public string LastTransType { get; set; } = null!; + public string LastTransType { get; set; } = null!; - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public string ManageType { get; set; } = null!; + public string ManageType { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public DateTime PutInTime { get; set; } + public DateTime PutInTime { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SerialNumber { get; set; } + public string? SerialNumber { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainer/InventoryContainer.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainer/InventoryContainer.cs index 2f52e50fe..01ee6d8ff 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainer/InventoryContainer.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainer/InventoryContainer.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryContainer; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryContainer +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.InventoryContainerDetail; + using WinIn.FasterZ.Wms.Z_Business.InventoryContainerDetail; -public class InventoryContainer : AuditedAggregateRoot -{ - public string BusinessStatus { get; set; } = null!; + public class InventoryContainer : AuditedAggregateRoot + { + public string BusinessStatus { get; set; } = null!; - public decimal Capacity { get; set; } + public decimal Capacity { get; set; } - public string ContainerCode { get; set; } = null!; + public string ContainerCode { get; set; } = null!; - public virtual ICollection InventoryContainerDetails { get; set; } = - new List(); + public virtual ICollection InventoryContainerDetails { get; set; } = + new List(); - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string? Number { get; set; } + public string? Number { get; set; } - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SeqNo { get; set; } + public string? SeqNo { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? Type { get; set; } + public string? Type { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainerDetail/InventoryContainerDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainerDetail/InventoryContainerDetail.cs index 1d0702400..cecac939b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainerDetail/InventoryContainerDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryContainerDetail/InventoryContainerDetail.cs @@ -1,56 +1,57 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryContainerDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryContainerDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.InventoryContainer; + using WinIn.FasterZ.Wms.Z_Business.InventoryContainer; -public class InventoryContainerDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class InventoryContainerDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string ContainerCode { get; set; } = null!; + public string ContainerCode { get; set; } = null!; - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public virtual InventoryContainer Master { get; set; } = null!; + public virtual InventoryContainer Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string? Number { get; set; } + public string? Number { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? Position { get; set; } + public string? Position { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProductNo { get; set; } + public string? ProductNo { get; set; } - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SeqNo { get; set; } + public string? SeqNo { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string? Year { get; set; } + public string? Year { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryErpBalance/InventoryErpBalance.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryErpBalance/InventoryErpBalance.cs index a4958bc86..5b0944293 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryErpBalance/InventoryErpBalance.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryErpBalance/InventoryErpBalance.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryErpBalance; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryErpBalance +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryErpBalance : AuditedAggregateRoot -{ - public string ItemCode { get; set; } = null!; + public class InventoryErpBalance : AuditedAggregateRoot + { + public string ItemCode { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string? Lot { get; set; } + public string? Lot { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectIn/InventoryExpectIn.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectIn/InventoryExpectIn.cs index fcab7a62e..502e21545 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectIn/InventoryExpectIn.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectIn/InventoryExpectIn.cs @@ -1,52 +1,53 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryExpectIn; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryExpectIn +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryExpectIn : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class InventoryExpectIn : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string JobNumber { get; set; } = null!; + public string JobNumber { get; set; } = null!; - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string? Lot { get; set; } + public string? Lot { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SerialNumber { get; set; } + public string? SerialNumber { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectOut/InventoryExpectOut.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectOut/InventoryExpectOut.cs index a98a9181d..51a50e87c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectOut/InventoryExpectOut.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryExpectOut/InventoryExpectOut.cs @@ -1,52 +1,53 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryExpectOut; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryExpectOut +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryExpectOut : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class InventoryExpectOut : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string JobNumber { get; set; } = null!; + public string JobNumber { get; set; } = null!; - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string? Lot { get; set; } + public string? Lot { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SerialNumber { get; set; } + public string? SerialNumber { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryLocationCapacity/InventoryLocationCapacity.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryLocationCapacity/InventoryLocationCapacity.cs index 769605917..0843c4668 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryLocationCapacity/InventoryLocationCapacity.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryLocationCapacity/InventoryLocationCapacity.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryLocationCapacity; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryLocationCapacity +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryLocationCapacity : AuditedAggregateRoot -{ - public decimal AvailableCapacity { get; set; } + public class InventoryLocationCapacity : AuditedAggregateRoot + { + public decimal AvailableCapacity { get; set; } - public decimal BearableOverloadCapacity { get; set; } + public decimal BearableOverloadCapacity { get; set; } - public bool IsInfinity { get; set; } + public bool IsInfinity { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal UsedCapacity { get; set; } + public decimal UsedCapacity { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventorySnapshot/InventorySnapshot.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventorySnapshot/InventorySnapshot.cs index 5c8f2fba9..8a0359bea 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventorySnapshot/InventorySnapshot.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventorySnapshot/InventorySnapshot.cs @@ -1,56 +1,57 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventorySnapshot; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventorySnapshot +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventorySnapshot : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class InventorySnapshot : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string? Lot { get; set; } + public string? Lot { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public DateTime PutInTime { get; set; } + public DateTime PutInTime { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SerialNumber { get; set; } + public string? SerialNumber { get; set; } - public DateTime SnapshotDate { get; set; } + public DateTime SnapshotDate { get; set; } - public DateTime SnapshotTime { get; set; } + public DateTime SnapshotTime { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransaction/InventoryTransaction.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransaction/InventoryTransaction.cs index b9800f3ef..3c08f42cc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransaction/InventoryTransaction.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransaction/InventoryTransaction.cs @@ -1,70 +1,71 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryTransaction; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryTransaction +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryTransaction : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class InventoryTransaction : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string? DocNumber { get; set; } + public string? DocNumber { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string? Lot { get; set; } + public string? Lot { get; set; } - public string ManageType { get; set; } = null!; + public string ManageType { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string TransInOut { get; set; } = null!; + public string TransInOut { get; set; } = null!; - public string TransNumber { get; set; } = null!; + public string TransNumber { get; set; } = null!; - public string TransSubType { get; set; } = null!; + public string TransSubType { get; set; } = null!; - public DateTime TransTime { get; set; } + public DateTime TransTime { get; set; } - public string TransType { get; set; } = null!; + public string TransType { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransferLog/InventoryTransferLog.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransferLog/InventoryTransferLog.cs index e69fe89bc..44109cd81 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransferLog/InventoryTransferLog.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/InventoryTransferLog/InventoryTransferLog.cs @@ -1,88 +1,89 @@ -namespace WinIn.FasterZ.Wms.Z_Business.InventoryTransferLog; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.InventoryTransferLog +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class InventoryTransferLog : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class InventoryTransferLog : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? DocNumber { get; set; } + public string? DocNumber { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string FromLocationArea { get; set; } = null!; + public string FromLocationArea { get; set; } = null!; - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string FromLocationGroup { get; set; } = null!; + public string FromLocationGroup { get; set; } = null!; - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string FromPackingCode { get; set; } = null!; + public string FromPackingCode { get; set; } = null!; - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromTransNumber { get; set; } = null!; + public string FromTransNumber { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string ToLocationArea { get; set; } = null!; + public string ToLocationArea { get; set; } = null!; - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string ToLocationGroup { get; set; } = null!; + public string ToLocationGroup { get; set; } = null!; - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string ToPackingCode { get; set; } = null!; + public string ToPackingCode { get; set; } = null!; - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToTransNumber { get; set; } = null!; + public string ToTransNumber { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string TransferNumber { get; set; } = null!; + public string TransferNumber { get; set; } = null!; - public DateTime TransferTime { get; set; } + public DateTime TransferTime { get; set; } - public string TransSubType { get; set; } = null!; + public string TransSubType { get; set; } = null!; - public string TransType { get; set; } = null!; + public string TransType { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJob/JobCheckJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJob/JobCheckJob.cs index 71ff3fe7d..168edbda5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJob/JobCheckJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJob/JobCheckJob.cs @@ -1,51 +1,52 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobCheckJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobCheckJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobCheckJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobCheckJobDetail; -public class JobCheckJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobCheckJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public string? DeliverNoteNumber { get; set; } + public string? DeliverNoteNumber { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public virtual ICollection JobCheckJobDetails { get; set; } = new List(); + public virtual ICollection JobCheckJobDetails { get; set; } = new List(); - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJobDetail/JobCheckJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJobDetail/JobCheckJobDetail.cs index 5518566ad..78572d397 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJobDetail/JobCheckJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCheckJobDetail/JobCheckJobDetail.cs @@ -1,62 +1,63 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobCheckJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobCheckJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobCheckJob; + using WinIn.FasterZ.Wms.Z_Business.JobCheckJob; -public class JobCheckJobDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class JobCheckJobDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string? CustomerItemCode { get; set; } + public string? CustomerItemCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public virtual JobCheckJob Master { get; set; } = null!; + public virtual JobCheckJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Order { get; set; } + public string? Order { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJob/JobCountJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJob/JobCountJob.cs index 197e90972..25533299a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJob/JobCountJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJob/JobCountJob.cs @@ -1,63 +1,64 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobCountJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobCountJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobCountJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobCountJobDetail; -public class JobCountJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobCountJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public string CountMethod { get; set; } = null!; + public string CountMethod { get; set; } = null!; - public string? CountPlanNumber { get; set; } + public string? CountPlanNumber { get; set; } - public string CountStage { get; set; } = null!; + public string CountStage { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? ItemCode { get; set; } + public string? ItemCode { get; set; } - public virtual ICollection JobCountJobDetails { get; set; } = new List(); + public virtual ICollection JobCountJobDetails { get; set; } = new List(); - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string? LocationCode { get; set; } + public string? LocationCode { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJobDetail/JobCountJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJobDetail/JobCountJobDetail.cs index 00c89aad3..387db85db 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJobDetail/JobCountJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobCountJobDetail/JobCountJobDetail.cs @@ -1,70 +1,71 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobCountJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobCountJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobCountJob; + using WinIn.FasterZ.Wms.Z_Business.JobCountJob; -public class JobCountJobDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class JobCountJobDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string? CountDescription { get; set; } + public string? CountDescription { get; set; } - public string CountLabel { get; set; } = null!; + public string CountLabel { get; set; } = null!; - public string? CountOperator { get; set; } + public string? CountOperator { get; set; } - public decimal CountQty { get; set; } + public decimal CountQty { get; set; } - public DateTime? CountTime { get; set; } + public DateTime? CountTime { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? InventoryLocationCode { get; set; } + public string? InventoryLocationCode { get; set; } - public decimal InventoryQty { get; set; } + public decimal InventoryQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public virtual JobCountJob Master { get; set; } = null!; + public virtual JobCountJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJob/JobDeliverJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJob/JobDeliverJob.cs index cf521cf30..e733821eb 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJob/JobDeliverJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJob/JobDeliverJob.cs @@ -1,60 +1,61 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobDeliverJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobDeliverJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobDeliverJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobDeliverJobDetail; -public class JobDeliverJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobDeliverJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public string? CustomerAddressCode { get; set; } + public string? CustomerAddressCode { get; set; } - public string CustomerCode { get; set; } = null!; + public string CustomerCode { get; set; } = null!; - public string? DeliverPlanNumber { get; set; } + public string? DeliverPlanNumber { get; set; } - public string? DeliverRequestNumber { get; set; } + public string? DeliverRequestNumber { get; set; } - public DateTime DeliverTime { get; set; } + public DateTime DeliverTime { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public virtual ICollection JobDeliverJobDetails { get; set; } = - new List(); + public virtual ICollection JobDeliverJobDetails { get; set; } = + new List(); - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJobDetail/JobDeliverJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJobDetail/JobDeliverJobDetail.cs index 282216aa6..829501056 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJobDetail/JobDeliverJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobDeliverJobDetail/JobDeliverJobDetail.cs @@ -1,96 +1,97 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobDeliverJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobDeliverJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobDeliverJob; + using WinIn.FasterZ.Wms.Z_Business.JobDeliverJob; -public class JobDeliverJobDetail : AuditedAggregateRoot -{ - public DateTime HandledArriveDate { get; set; } + public class JobDeliverJobDetail : AuditedAggregateRoot + { + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobDeliverJob Master { get; set; } = null!; + public virtual JobDeliverJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnTheWayLocationCode { get; set; } + public string? OnTheWayLocationCode { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string? ToLocationCode { get; set; } + public string? ToLocationCode { get; set; } - public string? ToLocationErpCode { get; set; } + public string? ToLocationErpCode { get; set; } - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToWarehouseCode { get; set; } + public string? ToWarehouseCode { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJob/JobInspectJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJob/JobInspectJob.cs index 329db8c93..0b3a1da26 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJob/JobInspectJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJob/JobInspectJob.cs @@ -1,70 +1,71 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobInspectJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobInspectJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobInspectJobDetail; -using WinIn.FasterZ.Wms.Z_Business.JobInspectJobSummaryDetail; + using WinIn.FasterZ.Wms.Z_Business.JobInspectJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobInspectJobSummaryDetail; -public class JobInspectJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobInspectJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public string? InspectNumber { get; set; } + public string? InspectNumber { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public virtual ICollection JobInspectJobDetails { get; set; } = - new List(); + public virtual ICollection JobInspectJobDetails { get; set; } = + new List(); - public virtual ICollection JobInspectJobSummaryDetails { get; set; } = - new List(); + public virtual ICollection JobInspectJobSummaryDetails { get; set; } = + new List(); - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string NextAction { get; set; } = null!; + public string NextAction { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public string? ReceiptNumber { get; set; } + public string? ReceiptNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobDetail/JobInspectJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobDetail/JobInspectJobDetail.cs index ecc7075ac..c19b4cf18 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobDetail/JobInspectJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobDetail/JobInspectJobDetail.cs @@ -1,92 +1,93 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobInspectJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobInspectJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobInspectJob; + using WinIn.FasterZ.Wms.Z_Business.JobInspectJob; -public class JobInspectJobDetail : AuditedAggregateRoot -{ - public string? AbcClass { get; set; } + public class JobInspectJobDetail : AuditedAggregateRoot + { + public string? AbcClass { get; set; } - public string? Appearance { get; set; } + public string? Appearance { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public decimal CrackQty { get; set; } + public decimal CrackQty { get; set; } - public string DetailInspectStatus { get; set; } = null!; + public string DetailInspectStatus { get; set; } = null!; - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FailedQty { get; set; } + public decimal FailedQty { get; set; } - public string? FailedReason { get; set; } + public string? FailedReason { get; set; } - public decimal GoodQty { get; set; } + public decimal GoodQty { get; set; } - public decimal InspectQty { get; set; } + public decimal InspectQty { get; set; } - public string InspectType { get; set; } = null!; + public string InspectType { get; set; } = null!; - public string? InspectUser { get; set; } + public string? InspectUser { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public virtual JobInspectJob Master { get; set; } = null!; + public virtual JobInspectJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public decimal NotPassedQty { get; set; } + public decimal NotPassedQty { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OtherPropertyJson { get; set; } + public string? OtherPropertyJson { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal ReceiveQty { get; set; } + public decimal ReceiveQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SamplePercent { get; set; } + public decimal SamplePercent { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } - public string? Volume { get; set; } + public string? Volume { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; - public string? Weight { get; set; } + public string? Weight { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobSummaryDetail/JobInspectJobSummaryDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobSummaryDetail/JobInspectJobSummaryDetail.cs index 6cd409f55..7eb33f85b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobSummaryDetail/JobInspectJobSummaryDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobInspectJobSummaryDetail/JobInspectJobSummaryDetail.cs @@ -1,70 +1,71 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobInspectJobSummaryDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobInspectJobSummaryDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobInspectJob; + using WinIn.FasterZ.Wms.Z_Business.JobInspectJob; -public class JobInspectJobSummaryDetail : AuditedAggregateRoot -{ - public string? AbcClass { get; set; } + public class JobInspectJobSummaryDetail : AuditedAggregateRoot + { + public string? AbcClass { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public decimal CrackQty { get; set; } + public decimal CrackQty { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FailedQty { get; set; } + public decimal FailedQty { get; set; } - public string? FailedReason { get; set; } + public string? FailedReason { get; set; } - public decimal GoodQty { get; set; } + public decimal GoodQty { get; set; } - public decimal InspectQty { get; set; } + public decimal InspectQty { get; set; } - public string? InspectReport { get; set; } + public string? InspectReport { get; set; } - public string InspectType { get; set; } = null!; + public string InspectType { get; set; } = null!; - public string? InspectUser { get; set; } + public string? InspectUser { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual JobInspectJob Master { get; set; } = null!; + public virtual JobInspectJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public decimal NotPassedQty { get; set; } + public decimal NotPassedQty { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal ReceiveQty { get; set; } + public decimal ReceiveQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SamplePercent { get; set; } + public decimal SamplePercent { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string SummaryInspectStatus { get; set; } = null!; + public string SummaryInspectStatus { get; set; } = null!; - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJob/JobIssueJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJob/JobIssueJob.cs index b0ad15d80..84dc05595 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJob/JobIssueJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJob/JobIssueJob.cs @@ -1,59 +1,60 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobIssueJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobIssueJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobIssueJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobIssueJobDetail; -public class JobIssueJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobIssueJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public virtual ICollection JobIssueJobDetails { get; set; } = new List(); + public virtual ICollection JobIssueJobDetails { get; set; } = new List(); - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string? MaterialRequestNumber { get; set; } + public string? MaterialRequestNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestType { get; set; } + public string? RequestType { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public bool UseOnTheWayLocation { get; set; } + public bool UseOnTheWayLocation { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } - public string? Workshop { get; set; } + public string? Workshop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJobDetail/JobIssueJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJobDetail/JobIssueJobDetail.cs index 0c8c617fd..8de9a0dd4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJobDetail/JobIssueJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobIssueJobDetail/JobIssueJobDetail.cs @@ -1,118 +1,119 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobIssueJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobIssueJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobIssueJob; + using WinIn.FasterZ.Wms.Z_Business.JobIssueJob; -public class JobIssueJobDetail : AuditedAggregateRoot -{ - public decimal DeliveryQty { get; set; } + public class JobIssueJobDetail : AuditedAggregateRoot + { + public decimal DeliveryQty { get; set; } - public string DistributionType { get; set; } = null!; + public string DistributionType { get; set; } = null!; - public DateTime ExpiredTime { get; set; } + public DateTime ExpiredTime { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobIssueJob Master { get; set; } = null!; + public virtual JobIssueJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnTheWayLocationCode { get; set; } + public string? OnTheWayLocationCode { get; set; } - public string? Operation { get; set; } + public string? Operation { get; set; } - public DateTime PlanBeginTime { get; set; } + public DateTime PlanBeginTime { get; set; } - public string PlannedSplitRule { get; set; } = null!; + public string PlannedSplitRule { get; set; } = null!; - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestLocationCode { get; set; } + public string? RequestLocationCode { get; set; } - public decimal RoundedQty { get; set; } + public decimal RoundedQty { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string? ToLocationCode { get; set; } + public string? ToLocationCode { get; set; } - public string? ToLocationErpCode { get; set; } + public string? ToLocationErpCode { get; set; } - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToWarehouseCode { get; set; } + public string? ToWarehouseCode { get; set; } - public string TruncType { get; set; } = null!; + public string TruncType { get; set; } = null!; - public string? Uom { get; set; } + public string? Uom { get; set; } - public string? WorkStation { get; set; } + public string? WorkStation { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJob/JobJisDeliverJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJob/JobJisDeliverJob.cs index fea105c51..982cbc4ca 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJob/JobJisDeliverJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJob/JobJisDeliverJob.cs @@ -1,68 +1,69 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJobDetail; -public class JobJisDeliverJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobJisDeliverJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public decimal ContainerQty { get; set; } + public decimal ContainerQty { get; set; } - public string? Customer { get; set; } + public string? Customer { get; set; } - public string? CustomerAddressCode { get; set; } + public string? CustomerAddressCode { get; set; } - public string? CustomerLocationCode { get; set; } + public string? CustomerLocationCode { get; set; } - public string? CustomerWarehouseCode { get; set; } + public string? CustomerWarehouseCode { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public decimal ItemQty { get; set; } + public decimal ItemQty { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public virtual ICollection JobJisDeliverJobDetails { get; set; } = - new List(); + public virtual ICollection JobJisDeliverJobDetails { get; set; } = + new List(); - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanTime { get; set; } + public DateTime PlanTime { get; set; } - public string? Position { get; set; } + public string? Position { get; set; } - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJobDetail/JobJisDeliverJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJobDetail/JobJisDeliverJobDetail.cs index f6edf311a..e929d4a32 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJobDetail/JobJisDeliverJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobJisDeliverJobDetail/JobJisDeliverJobDetail.cs @@ -1,48 +1,49 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJob; + using WinIn.FasterZ.Wms.Z_Business.JobJisDeliverJob; -public class JobJisDeliverJobDetail : AuditedAggregateRoot -{ - public string? ContainerCode { get; set; } + public class JobJisDeliverJobDetail : AuditedAggregateRoot + { + public string? ContainerCode { get; set; } - public string? ContainerDesc { get; set; } + public string? ContainerDesc { get; set; } - public string? ContainerName { get; set; } + public string? ContainerName { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string? FromLocationCode { get; set; } + public string? FromLocationCode { get; set; } - public string? FromLocationErpCode { get; set; } + public string? FromLocationErpCode { get; set; } - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromWarehouseCode { get; set; } + public string? FromWarehouseCode { get; set; } - public decimal ItemQty { get; set; } + public decimal ItemQty { get; set; } - public virtual JobJisDeliverJob Master { get; set; } = null!; + public virtual JobJisDeliverJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string? Number { get; set; } + public string? Number { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string? ToLocationCode { get; set; } + public string? ToLocationCode { get; set; } - public string? ToLocationErpCode { get; set; } + public string? ToLocationErpCode { get; set; } - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToWarehouseCode { get; set; } + public string? ToWarehouseCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJob/JobProductReceiveJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJob/JobProductReceiveJob.cs index 5f881c508..968de6862 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJob/JobProductReceiveJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJob/JobProductReceiveJob.cs @@ -1,56 +1,57 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJobDetail; -public class JobProductReceiveJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobProductReceiveJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public virtual ICollection JobProductReceiveJobDetails { get; set; } = - new List(); + public virtual ICollection JobProductReceiveJobDetails { get; set; } = + new List(); - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? ProductionPlanNumber { get; set; } + public string? ProductionPlanNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Shift { get; set; } + public string? Shift { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } - public string Workshop { get; set; } = null!; + public string Workshop { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJobDetail/JobProductReceiveJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJobDetail/JobProductReceiveJobDetail.cs index 492445bd6..ab9b7963b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJobDetail/JobProductReceiveJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductReceiveJobDetail/JobProductReceiveJobDetail.cs @@ -1,88 +1,89 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJob; + using WinIn.FasterZ.Wms.Z_Business.JobProductReceiveJob; -public class JobProductReceiveJobDetail : AuditedAggregateRoot -{ - public DateTime HandledArriveDate { get; set; } + public class JobProductReceiveJobDetail : AuditedAggregateRoot + { + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobProductReceiveJob Master { get; set; } = null!; + public virtual JobProductReceiveJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string ProdLine { get; set; } = null!; + public string ProdLine { get; set; } = null!; - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJob/JobProductionReturnJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJob/JobProductionReturnJob.cs index f0c19d655..14c2ade7e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJob/JobProductionReturnJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJob/JobProductionReturnJob.cs @@ -1,52 +1,53 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJobDetail; -public class JobProductionReturnJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobProductionReturnJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public virtual ICollection JobProductionReturnJobDetails { get; set; } = - new List(); + public virtual ICollection JobProductionReturnJobDetails { get; set; } = + new List(); - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? ProductionReturnRequestNumber { get; set; } + public string? ProductionReturnRequestNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJobDetail/JobProductionReturnJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJobDetail/JobProductionReturnJobDetail.cs index 659dd41a9..736e54dee 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJobDetail/JobProductionReturnJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobProductionReturnJobDetail/JobProductionReturnJobDetail.cs @@ -1,94 +1,95 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJob; + using WinIn.FasterZ.Wms.Z_Business.JobProductionReturnJob; -public class JobProductionReturnJobDetail : AuditedAggregateRoot -{ - public string? FromLocationArea { get; set; } + public class JobProductionReturnJobDetail : AuditedAggregateRoot + { + public string? FromLocationArea { get; set; } - public string? FromLocationCode { get; set; } + public string? FromLocationCode { get; set; } - public string? FromLocationErpCode { get; set; } + public string? FromLocationErpCode { get; set; } - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromWarehouseCode { get; set; } + public string? FromWarehouseCode { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobProductionReturnJob Master { get; set; } = null!; + public virtual JobProductionReturnJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobCopy/JobPurchaseReceiptJobCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobCopy/JobPurchaseReceiptJobCopy.cs index c3044f9a3..3e979d93c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobCopy/JobPurchaseReceiptJobCopy.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobCopy/JobPurchaseReceiptJobCopy.cs @@ -1,64 +1,65 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJobCopy; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJobCopy +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class JobPurchaseReceiptJobCopy : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobPurchaseReceiptJobCopy : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanArriveDate { get; set; } + public DateTime PlanArriveDate { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public string? SupplierAddress { get; set; } + public string? SupplierAddress { get; set; } - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? SupplierName { get; set; } + public string? SupplierName { get; set; } - public string? TimeWindow { get; set; } + public string? TimeWindow { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetail/JobPurchaseReceiptJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetail/JobPurchaseReceiptJobDetail.cs index bbd11d94b..a7fc9940a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetail/JobPurchaseReceiptJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetail/JobPurchaseReceiptJobDetail.cs @@ -1,102 +1,103 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJob; + using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJob; -public class JobPurchaseReceiptJobDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class JobPurchaseReceiptJobDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? FailedReason { get; set; } + public string? FailedReason { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string? InspectPhotoJson { get; set; } + public string? InspectPhotoJson { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? MassDefect { get; set; } + public string? MassDefect { get; set; } - public virtual JobPurchaseReceiptJob Master { get; set; } = null!; + public virtual JobPurchaseReceiptJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string PurchaseReceiptInspectStatus { get; set; } = null!; + public string PurchaseReceiptInspectStatus { get; set; } = null!; - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public decimal SupplierPackQty { get; set; } + public decimal SupplierPackQty { get; set; } - public string? SupplierPackUom { get; set; } + public string? SupplierPackUom { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetailCopy/JobPurchaseReceiptJobDetailCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetailCopy/JobPurchaseReceiptJobDetailCopy.cs index d1743ddf9..f0273d6a0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetailCopy/JobPurchaseReceiptJobDetailCopy.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReceiptJobDetailCopy/JobPurchaseReceiptJobDetailCopy.cs @@ -1,102 +1,103 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJobDetailCopy; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJobDetailCopy +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJob; + using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReceiptJob; -public class JobPurchaseReceiptJobDetailCopy : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class JobPurchaseReceiptJobDetailCopy : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? FailedReason { get; set; } + public string? FailedReason { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string? InspectPhotoJson { get; set; } + public string? InspectPhotoJson { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? MassDefect { get; set; } + public string? MassDefect { get; set; } - public virtual JobPurchaseReceiptJob Master { get; set; } = null!; + public virtual JobPurchaseReceiptJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string PurchaseReceiptInspectStatus { get; set; } = null!; + public string PurchaseReceiptInspectStatus { get; set; } = null!; - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public decimal SupplierPackQty { get; set; } + public decimal SupplierPackQty { get; set; } - public string? SupplierPackUom { get; set; } + public string? SupplierPackUom { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJob/JobPurchaseReturnJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJob/JobPurchaseReturnJob.cs index c1db9bcec..287e22f71 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJob/JobPurchaseReturnJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJob/JobPurchaseReturnJob.cs @@ -1,66 +1,67 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJobDetail; -public class JobPurchaseReturnJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobPurchaseReturnJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public virtual ICollection JobPurchaseReturnJobDetails { get; set; } = - new List(); + public virtual ICollection JobPurchaseReturnJobDetails { get; set; } = + new List(); - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? PurchaseReturnRequestNumber { get; set; } + public string? PurchaseReturnRequestNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? ReturnReason { get; set; } + public string? ReturnReason { get; set; } - public DateTime ReturnTime { get; set; } + public DateTime ReturnTime { get; set; } - public string ReturnType { get; set; } = null!; + public string ReturnType { get; set; } = null!; - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJobDetail/JobPurchaseReturnJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJobDetail/JobPurchaseReturnJobDetail.cs index 801ff99f3..2fa7dd2db 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJobDetail/JobPurchaseReturnJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPurchaseReturnJobDetail/JobPurchaseReturnJobDetail.cs @@ -1,90 +1,91 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJob; + using WinIn.FasterZ.Wms.Z_Business.JobPurchaseReturnJob; -public class JobPurchaseReturnJobDetail : AuditedAggregateRoot -{ - public DateTime HandledArriveDate { get; set; } + public class JobPurchaseReturnJobDetail : AuditedAggregateRoot + { + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobPurchaseReturnJob Master { get; set; } = null!; + public virtual JobPurchaseReturnJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJob/JobPutawayJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJob/JobPutawayJob.cs index 718a55394..a71c48a5b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJob/JobPutawayJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJob/JobPutawayJob.cs @@ -1,70 +1,71 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobPutawayJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobPutawayJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobPutawayJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobPutawayJobDetail; -public class JobPutawayJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobPutawayJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public string? InspectNumber { get; set; } + public string? InspectNumber { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public virtual ICollection JobPutawayJobDetails { get; set; } = - new List(); + public virtual ICollection JobPutawayJobDetails { get; set; } = + new List(); - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? ProductReceiptNumber { get; set; } + public string? ProductReceiptNumber { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public string PutawayMode { get; set; } = null!; + public string PutawayMode { get; set; } = null!; - public string? ReceiptNumber { get; set; } + public string? ReceiptNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJobDetail/JobPutawayJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJobDetail/JobPutawayJobDetail.cs index 229d83562..7569c8760 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJobDetail/JobPutawayJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobPutawayJobDetail/JobPutawayJobDetail.cs @@ -1,100 +1,101 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobPutawayJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobPutawayJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobPutawayJob; + using WinIn.FasterZ.Wms.Z_Business.JobPutawayJob; -public class JobPutawayJobDetail : AuditedAggregateRoot -{ - public string? FromLocationArea { get; set; } + public class JobPutawayJobDetail : AuditedAggregateRoot + { + public string? FromLocationArea { get; set; } - public string? FromLocationCode { get; set; } + public string? FromLocationCode { get; set; } - public string? FromLocationErpCode { get; set; } + public string? FromLocationErpCode { get; set; } - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromWarehouseCode { get; set; } + public string? FromWarehouseCode { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobPutawayJob Master { get; set; } = null!; + public virtual JobPutawayJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJob/JobUnplannedIssueJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJob/JobUnplannedIssueJob.cs index f9df317bc..37a2b4449 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJob/JobUnplannedIssueJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJob/JobUnplannedIssueJob.cs @@ -1,58 +1,59 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJobDetail; -public class JobUnplannedIssueJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobUnplannedIssueJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime BuildDate { get; set; } + public DateTime BuildDate { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public string? DeptCode { get; set; } + public string? DeptCode { get; set; } - public string? DeptName { get; set; } + public string? DeptName { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public virtual ICollection JobUnplannedIssueJobDetails { get; set; } = - new List(); + public virtual ICollection JobUnplannedIssueJobDetails { get; set; } = + new List(); - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? UnplannedIssueRequestNumber { get; set; } + public string? UnplannedIssueRequestNumber { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJobDetail/JobUnplannedIssueJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJobDetail/JobUnplannedIssueJobDetail.cs index e276e8db0..f86d8c263 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJobDetail/JobUnplannedIssueJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedIssueJobDetail/JobUnplannedIssueJobDetail.cs @@ -1,92 +1,93 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJob; + using WinIn.FasterZ.Wms.Z_Business.JobUnplannedIssueJob; -public class JobUnplannedIssueJobDetail : AuditedAggregateRoot -{ - public string? CaseCode { get; set; } + public class JobUnplannedIssueJobDetail : AuditedAggregateRoot + { + public string? CaseCode { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobUnplannedIssueJob Master { get; set; } = null!; + public virtual JobUnplannedIssueJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnceBusiCode { get; set; } + public string? OnceBusiCode { get; set; } - public string? ProjCapacityCode { get; set; } + public string? ProjCapacityCode { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJob/JobUnplannedReceiptJob.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJob/JobUnplannedReceiptJob.cs index e4e08d07b..f20425bda 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJob/JobUnplannedReceiptJob.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJob/JobUnplannedReceiptJob.cs @@ -1,58 +1,59 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJob; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJob +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJobDetail; + using WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJobDetail; -public class JobUnplannedReceiptJob : AuditedAggregateRoot -{ - public DateTime? AcceptTime { get; set; } + public class JobUnplannedReceiptJob : AuditedAggregateRoot + { + public DateTime? AcceptTime { get; set; } - public Guid? AcceptUserId { get; set; } + public Guid? AcceptUserId { get; set; } - public string? AcceptUserName { get; set; } + public string? AcceptUserName { get; set; } - public DateTime BuildDate { get; set; } + public DateTime BuildDate { get; set; } - public DateTime? CompleteTime { get; set; } + public DateTime? CompleteTime { get; set; } - public Guid? CompleteUserId { get; set; } + public Guid? CompleteUserId { get; set; } - public string? CompleteUserName { get; set; } + public string? CompleteUserName { get; set; } - public string? DeptCode { get; set; } + public string? DeptCode { get; set; } - public string? DeptName { get; set; } + public string? DeptName { get; set; } - public bool? IsAutoComplete { get; set; } + public bool? IsAutoComplete { get; set; } - public string? JobDescription { get; set; } + public string? JobDescription { get; set; } - public string JobStatus { get; set; } = null!; + public string JobStatus { get; set; } = null!; - public string JobType { get; set; } = null!; + public string JobType { get; set; } = null!; - public virtual ICollection JobUnplannedReceiptJobDetails { get; set; } = - new List(); + public virtual ICollection JobUnplannedReceiptJobDetails { get; set; } = + new List(); - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public int Priority { get; set; } + public int Priority { get; set; } - public int PriorityIncrement { get; set; } + public int PriorityIncrement { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? UnplannedReceiptRequestNumber { get; set; } + public string? UnplannedReceiptRequestNumber { get; set; } - public string? UpStreamJobNumber { get; set; } + public string? UpStreamJobNumber { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkGroupCode { get; set; } + public string? WorkGroupCode { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJobDetail/JobUnplannedReceiptJobDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJobDetail/JobUnplannedReceiptJobDetail.cs index 183c5a055..7ad65fb78 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJobDetail/JobUnplannedReceiptJobDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/JobUnplannedReceiptJobDetail/JobUnplannedReceiptJobDetail.cs @@ -1,92 +1,93 @@ -namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJobDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJobDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJob; + using WinIn.FasterZ.Wms.Z_Business.JobUnplannedReceiptJob; -public class JobUnplannedReceiptJobDetail : AuditedAggregateRoot -{ - public string? CaseCode { get; set; } + public class JobUnplannedReceiptJobDetail : AuditedAggregateRoot + { + public string? CaseCode { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual JobUnplannedReceiptJob Master { get; set; } = null!; + public virtual JobUnplannedReceiptJob Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnceBusiCode { get; set; } + public string? OnceBusiCode { get; set; } - public string? ProjCapacityCode { get; set; } + public string? ProjCapacityCode { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelCountLabel/LabelCountLabel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelCountLabel/LabelCountLabel.cs index 02c3098a1..b552588fc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelCountLabel/LabelCountLabel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelCountLabel/LabelCountLabel.cs @@ -1,14 +1,15 @@ -namespace WinIn.FasterZ.Wms.Z_Business.LabelCountLabel; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.LabelCountLabel +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class LabelCountLabel : AuditedAggregateRoot -{ - public int CountNumber { get; set; } + public class LabelCountLabel : AuditedAggregateRoot + { + public int CountNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RuleCode { get; set; } = null!; + public string RuleCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs index abc76f0aa..0a0104ce6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs @@ -1,78 +1,79 @@ -namespace WinIn.FasterZ.Wms.Z_Business.LabelInventoryLabel; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.LabelInventoryLabel +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class LabelInventoryLabel : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class LabelInventoryLabel : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FullBarcodeString { get; set; } + public string? FullBarcodeString { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string LabelStatus { get; set; } = null!; + public string LabelStatus { get; set; } = null!; - public string LabelType { get; set; } = null!; + public string LabelType { get; set; } = null!; - public string? LocationErpCode { get; set; } + public string? LocationErpCode { get; set; } - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public DateTime? PlanArriveDate { get; set; } + public DateTime? PlanArriveDate { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProductionInfoProdLine { get; set; } + public string? ProductionInfoProdLine { get; set; } - public string? ProductionInfoShift { get; set; } + public string? ProductionInfoShift { get; set; } - public string? ProductionInfoTeam { get; set; } + public string? ProductionInfoTeam { get; set; } - public string? PurchaseInfoAsnNumber { get; set; } + public string? PurchaseInfoAsnNumber { get; set; } - public string? PurchaseInfoPoNumber { get; set; } + public string? PurchaseInfoPoNumber { get; set; } - public string? PurchaseInfoRpNumber { get; set; } + public string? PurchaseInfoRpNumber { get; set; } - public string? PurchaseInfoSupplierCode { get; set; } + public string? PurchaseInfoSupplierCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? QualityInfoQlevel { get; set; } + public string? QualityInfoQlevel { get; set; } - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfoQualityFile { get; set; } - public string? RecommendLocationCode { get; set; } + public string? RecommendLocationCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Specifications { get; set; } + public string? Specifications { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? SupplierItemCode { get; set; } + public string? SupplierItemCode { get; set; } - public string? SupplierItemName { get; set; } + public string? SupplierItemName { get; set; } - public string? SupplierName { get; set; } + public string? SupplierName { get; set; } - public string? SupplierSimpleName { get; set; } + public string? SupplierSimpleName { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelLabelDefinition/LabelLabelDefinition.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelLabelDefinition/LabelLabelDefinition.cs index c6535ee6e..21d0e7263 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelLabelDefinition/LabelLabelDefinition.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelLabelDefinition/LabelLabelDefinition.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.LabelLabelDefinition; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.LabelLabelDefinition +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class LabelLabelDefinition : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class LabelLabelDefinition : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public string? Format { get; set; } + public string? Format { get; set; } - public string? Name { get; set; } + public string? Name { get; set; } - public string? Prefix { get; set; } + public string? Prefix { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Separator { get; set; } + public string? Separator { get; set; } - public int SerialLength { get; set; } + public int SerialLength { get; set; } - public string? Type { get; set; } + public string? Type { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletCode/LabelPalletCode.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletCode/LabelPalletCode.cs index ab9531de4..8447d6f5c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletCode/LabelPalletCode.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletCode/LabelPalletCode.cs @@ -1,14 +1,15 @@ -namespace WinIn.FasterZ.Wms.Z_Business.LabelPalletCode; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.LabelPalletCode +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class LabelPalletCode : AuditedAggregateRoot -{ - public int PalletlNumber { get; set; } + public class LabelPalletCode : AuditedAggregateRoot + { + public int PalletlNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RuleCode { get; set; } = null!; + public string RuleCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletLabel/LabelPalletLabel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletLabel/LabelPalletLabel.cs index 50ded75ea..dfab177ca 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletLabel/LabelPalletLabel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelPalletLabel/LabelPalletLabel.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.LabelPalletLabel; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.LabelPalletLabel +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class LabelPalletLabel : AuditedAggregateRoot -{ - public string Code { get; set; } = null!; + public class LabelPalletLabel : AuditedAggregateRoot + { + public string Code { get; set; } = null!; - public string? Desc1 { get; set; } + public string? Desc1 { get; set; } - public string? Desc2 { get; set; } + public string? Desc2 { get; set; } - public bool HasItem { get; set; } + public bool HasItem { get; set; } - public string LabelStatus { get; set; } = null!; + public string LabelStatus { get; set; } = null!; - public string LabelType { get; set; } = null!; + public string LabelType { get; set; } = null!; - public string? Name { get; set; } + public string? Name { get; set; } - public Guid ParentId { get; set; } + public Guid ParentId { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs index bcad18c01..286ee9612 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs @@ -1,52 +1,53 @@ -namespace WinIn.FasterZ.Wms.Z_Business.LabelSaleLabel; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.LabelSaleLabel +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class LabelSaleLabel : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class LabelSaleLabel : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string Code { get; set; } = null!; + public string Code { get; set; } = null!; - public string ContainerCode { get; set; } = null!; + public string ContainerCode { get; set; } = null!; - public string DocumentCode { get; set; } = null!; + public string DocumentCode { get; set; } = null!; - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string FullBarcodeString { get; set; } = null!; + public string FullBarcodeString { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string LabelStatus { get; set; } = null!; + public string LabelStatus { get; set; } = null!; - public string LabelType { get; set; } = null!; + public string LabelType { get; set; } = null!; - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? QualityInfoQlevel { get; set; } + public string? QualityInfoQlevel { get; set; } - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfoQualityFile { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SaleInfoSaleInfoName { get; set; } + public string? SaleInfoSaleInfoName { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSerialCode/LabelSerialCode.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSerialCode/LabelSerialCode.cs index 904d5699e..8e3781f12 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSerialCode/LabelSerialCode.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSerialCode/LabelSerialCode.cs @@ -1,14 +1,15 @@ -namespace WinIn.FasterZ.Wms.Z_Business.LabelSerialCode; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.LabelSerialCode +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class LabelSerialCode : AuditedAggregateRoot -{ - public string? Remark { get; set; } + public class LabelSerialCode : AuditedAggregateRoot + { + public string? Remark { get; set; } - public string RuleCode { get; set; } = null!; + public string RuleCode { get; set; } = null!; - public int SerialNumber { get; set; } + public int SerialNumber { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageAnnouncement/MessageAnnouncement.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageAnnouncement/MessageAnnouncement.cs index f519f1f11..7d2f4b186 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageAnnouncement/MessageAnnouncement.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageAnnouncement/MessageAnnouncement.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.MessageAnnouncement; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.MessageAnnouncement +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class MessageAnnouncement : AuditedAggregateRoot -{ - public DateTime ActiveTime { get; set; } + public class MessageAnnouncement : AuditedAggregateRoot + { + public DateTime ActiveTime { get; set; } - public string Brief { get; set; } = null!; + public string Brief { get; set; } = null!; - public string? Content { get; set; } + public string? Content { get; set; } - public DateTime ExpireTime { get; set; } + public DateTime ExpireTime { get; set; } - public string MessageLevel { get; set; } = null!; + public string MessageLevel { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Title { get; set; } = null!; + public string Title { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageType/MessageMessageType.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageType/MessageMessageType.cs index 3808c31d8..ae196b41b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageType/MessageMessageType.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageType/MessageMessageType.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.MessageMessageType; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.MessageMessageType +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class MessageMessageType : AuditedAggregateRoot -{ - public string? EmailTemplate { get; set; } + public class MessageMessageType : AuditedAggregateRoot + { + public string? EmailTemplate { get; set; } - public bool IsSendEmail { get; set; } + public bool IsSendEmail { get; set; } - public bool IsSendSms { get; set; } + public bool IsSendSms { get; set; } - public string? MessageTypeCode { get; set; } + public string? MessageTypeCode { get; set; } - public string? MessageTypeName { get; set; } + public string? MessageTypeName { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SmsTemplate { get; set; } + public string? SmsTemplate { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageTypeSubscribe/MessageMessageTypeSubscribe.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageTypeSubscribe/MessageMessageTypeSubscribe.cs index 013018087..83e51ed05 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageTypeSubscribe/MessageMessageTypeSubscribe.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageMessageTypeSubscribe/MessageMessageTypeSubscribe.cs @@ -1,16 +1,17 @@ -namespace WinIn.FasterZ.Wms.Z_Business.MessageMessageTypeSubscribe; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.MessageMessageTypeSubscribe +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class MessageMessageTypeSubscribe : AuditedAggregateRoot -{ - public string? MessageTypeCode { get; set; } + public class MessageMessageTypeSubscribe : AuditedAggregateRoot + { + public string? MessageTypeCode { get; set; } - public Guid MessageTypeId { get; set; } + public Guid MessageTypeId { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Username { get; set; } + public string? Username { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageNotifyMessage/MessageNotifyMessage.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageNotifyMessage/MessageNotifyMessage.cs index 00995cc8a..ac339722e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageNotifyMessage/MessageNotifyMessage.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageNotifyMessage/MessageNotifyMessage.cs @@ -1,20 +1,21 @@ -namespace WinIn.FasterZ.Wms.Z_Business.MessageNotifyMessage; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.MessageNotifyMessage +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class MessageNotifyMessage : AuditedAggregateRoot -{ - public string? Content { get; set; } + public class MessageNotifyMessage : AuditedAggregateRoot + { + public string? Content { get; set; } - public string MessageLevel { get; set; } = null!; + public string MessageLevel { get; set; } = null!; - public string MessageType { get; set; } = null!; + public string MessageType { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public DateTime SendTime { get; set; } + public DateTime SendTime { get; set; } - public string Title { get; set; } = null!; + public string Title { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessagePrivateMessage/MessagePrivateMessage.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessagePrivateMessage/MessagePrivateMessage.cs index 9feb1c925..557ee9c8e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessagePrivateMessage/MessagePrivateMessage.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessagePrivateMessage/MessagePrivateMessage.cs @@ -1,30 +1,31 @@ -namespace WinIn.FasterZ.Wms.Z_Business.MessagePrivateMessage; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.MessagePrivateMessage +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class MessagePrivateMessage : AuditedAggregateRoot -{ - public string? Content { get; set; } + public class MessagePrivateMessage : AuditedAggregateRoot + { + public string? Content { get; set; } - public Guid FromUserId { get; set; } + public Guid FromUserId { get; set; } - public string FromUsername { get; set; } = null!; + public string FromUsername { get; set; } = null!; - public bool HasRead { get; set; } + public bool HasRead { get; set; } - public string MessageLevel { get; set; } = null!; + public string MessageLevel { get; set; } = null!; - public DateTime? ReadTime { get; set; } + public DateTime? ReadTime { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public DateTime SendTime { get; set; } + public DateTime SendTime { get; set; } - public string Title { get; set; } = null!; + public string Title { get; set; } = null!; - public Guid ToUserId { get; set; } + public Guid ToUserId { get; set; } - public string ToUsername { get; set; } = null!; + public string ToUsername { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageUserNotifyMessage/MessageUserNotifyMessage.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageUserNotifyMessage/MessageUserNotifyMessage.cs index 0685c36e8..2ae2985a6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageUserNotifyMessage/MessageUserNotifyMessage.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/MessageUserNotifyMessage/MessageUserNotifyMessage.cs @@ -1,32 +1,33 @@ -namespace WinIn.FasterZ.Wms.Z_Business.MessageUserNotifyMessage; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.MessageUserNotifyMessage +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class MessageUserNotifyMessage : AuditedAggregateRoot -{ - public bool EmailHasSent { get; set; } + public class MessageUserNotifyMessage : AuditedAggregateRoot + { + public bool EmailHasSent { get; set; } - public DateTime? EmailSendTime { get; set; } + public DateTime? EmailSendTime { get; set; } - public bool HasPush { get; set; } + public bool HasPush { get; set; } - public bool HasRead { get; set; } + public bool HasRead { get; set; } - public Guid MessageId { get; set; } + public Guid MessageId { get; set; } - public DateTime? PushTime { get; set; } + public DateTime? PushTime { get; set; } - public DateTime? ReadTime { get; set; } + public DateTime? ReadTime { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public bool SmsHasSent { get; set; } + public bool SmsHasSent { get; set; } - public DateTime? SmsSendTime { get; set; } + public DateTime? SmsSendTime { get; set; } - public string? Title { get; set; } + public string? Title { get; set; } - public string? Username { get; set; } + public string? Username { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNote/StoreBackFlushNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNote/StoreBackFlushNote.cs index 3df3ef334..5641163d4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNote/StoreBackFlushNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNote/StoreBackFlushNote.cs @@ -1,72 +1,73 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNoteDetail; -public class StoreBackFlushNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreBackFlushNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public DateTime CompleteTime { get; set; } + public DateTime CompleteTime { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string Lot { get; set; } = null!; + public string Lot { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PackingCode { get; set; } + public string? PackingCode { get; set; } - public string ProdLine { get; set; } = null!; + public string ProdLine { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string ProductionPlanNumber { get; set; } = null!; + public string ProductionPlanNumber { get; set; } = null!; - public string? ProductReceiptNumber { get; set; } + public string? ProductReceiptNumber { get; set; } - public string? ProductRecycleNumber { get; set; } + public string? ProductRecycleNumber { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Shift { get; set; } + public string? Shift { get; set; } - public virtual ICollection StoreBackFlushNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreBackFlushNoteDetails { get; set; } = + new List(); - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } - public string Workshop { get; set; } = null!; + public string Workshop { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNoteDetail/StoreBackFlushNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNoteDetail/StoreBackFlushNoteDetail.cs index a689fc985..62f3fb56e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNoteDetail/StoreBackFlushNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreBackFlushNoteDetail/StoreBackFlushNoteDetail.cs @@ -1,62 +1,63 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNote; + using WinIn.FasterZ.Wms.Z_Business.StoreBackFlushNote; -public class StoreBackFlushNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreBackFlushNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? BomVersion { get; set; } + public string? BomVersion { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public bool IsOffLine { get; set; } + public bool IsOffLine { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string LocationArea { get; set; } = null!; + public string LocationArea { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string LocationGroup { get; set; } = null!; + public string LocationGroup { get; set; } = null!; - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreBackFlushNote Master { get; set; } = null!; + public virtual StoreBackFlushNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNote/StoreContainerBindNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNote/StoreContainerBindNote.cs index 831231436..3b71fc545 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNote/StoreContainerBindNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNote/StoreContainerBindNote.cs @@ -1,30 +1,31 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNoteDetail; -public class StoreContainerBindNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreContainerBindNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime BindTime { get; set; } + public DateTime BindTime { get; set; } - public string BindType { get; set; } = null!; + public string BindType { get; set; } = null!; - public string ContainerCode { get; set; } = null!; + public string ContainerCode { get; set; } = null!; - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreContainerBindNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreContainerBindNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNoteDetail/StoreContainerBindNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNoteDetail/StoreContainerBindNoteDetail.cs index 14a0b4b87..7a07ca484 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNoteDetail/StoreContainerBindNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreContainerBindNoteDetail/StoreContainerBindNoteDetail.cs @@ -1,46 +1,47 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNote; + using WinIn.FasterZ.Wms.Z_Business.StoreContainerBindNote; -public class StoreContainerBindNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreContainerBindNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreContainerBindNote Master { get; set; } = null!; + public virtual StoreContainerBindNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNote/StoreCountAdjustNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNote/StoreCountAdjustNote.cs index 5b01d63c8..b98f6870a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNote/StoreCountAdjustNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNote/StoreCountAdjustNote.cs @@ -1,34 +1,35 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNoteDetail; -public class StoreCountAdjustNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreCountAdjustNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? CountAdjustRequestNumber { get; set; } + public string? CountAdjustRequestNumber { get; set; } - public string? CountNoteNumber { get; set; } + public string? CountNoteNumber { get; set; } - public string? CountPlanNumber { get; set; } + public string? CountPlanNumber { get; set; } - public bool IsAdjusted { get; set; } + public bool IsAdjusted { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreCountAdjustNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreCountAdjustNoteDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNoteDetail/StoreCountAdjustNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNoteDetail/StoreCountAdjustNoteDetail.cs index 2660a7468..4e661d704 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNoteDetail/StoreCountAdjustNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustNoteDetail/StoreCountAdjustNoteDetail.cs @@ -1,68 +1,69 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNote; + using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNote; -public class StoreCountAdjustNoteDetail : AuditedAggregateRoot -{ - public decimal AdjustQty { get; set; } + public class StoreCountAdjustNoteDetail : AuditedAggregateRoot + { + public decimal AdjustQty { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string CountLabel { get; set; } = null!; + public string CountLabel { get; set; } = null!; - public decimal CountQty { get; set; } + public decimal CountQty { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal InventoryQty { get; set; } + public decimal InventoryQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreCountAdjustNote Master { get; set; } = null!; + public virtual StoreCountAdjustNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string TransInOut { get; set; } = null!; + public string TransInOut { get; set; } = null!; - public string? Uom { get; set; } + public string? Uom { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequest/StoreCountAdjustRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequest/StoreCountAdjustRequest.cs index 61297fbc6..de82838af 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequest/StoreCountAdjustRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequest/StoreCountAdjustRequest.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail; -public class StoreCountAdjustRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreCountAdjustRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public string? CountNoteNumber { get; set; } + public string? CountNoteNumber { get; set; } - public string? CountPlanNumber { get; set; } + public string? CountPlanNumber { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreCountAdjustRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreCountAdjustRequestDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequestDetail/StoreCountAdjustRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequestDetail/StoreCountAdjustRequestDetail.cs index 171450fb7..c2ea7b2d8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequestDetail/StoreCountAdjustRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountAdjustRequestDetail/StoreCountAdjustRequestDetail.cs @@ -1,64 +1,65 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest; -public class StoreCountAdjustRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreCountAdjustRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public decimal CountQty { get; set; } + public decimal CountQty { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal InventoryQty { get; set; } + public decimal InventoryQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreCountAdjustRequest Master { get; set; } = null!; + public virtual StoreCountAdjustRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs index 5f2da5a32..e471dddf7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; + using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; -public class StoreCountNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreCountNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool Adjusted { get; set; } + public bool Adjusted { get; set; } - public DateTime BeginTime { get; set; } + public DateTime BeginTime { get; set; } - public string? CountPlanNumber { get; set; } + public string? CountPlanNumber { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public DateTime EndTime { get; set; } + public DateTime EndTime { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Stage { get; set; } = null!; + public string Stage { get; set; } = null!; - public virtual ICollection StoreCountNoteDetailCopies { get; set; } = - new List(); + public virtual ICollection StoreCountNoteDetailCopies { get; set; } = + new List(); - public virtual ICollection StoreCountNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreCountNoteDetails { get; set; } = + new List(); - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs index 8cafd85f0..8e25d9edd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs @@ -1,30 +1,31 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class StoreCountNoteCopy : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreCountNoteCopy : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool Adjusted { get; set; } + public bool Adjusted { get; set; } - public DateTime BeginTime { get; set; } + public DateTime BeginTime { get; set; } - public string? CountPlanNumber { get; set; } + public string? CountPlanNumber { get; set; } - public string? Description { get; set; } + public string? Description { get; set; } - public DateTime EndTime { get; set; } + public DateTime EndTime { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Stage { get; set; } = null!; + public string Stage { get; set; } = null!; - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetail/StoreCountNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetail/StoreCountNoteDetail.cs index 96659bb00..1c9474702 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetail/StoreCountNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetail/StoreCountNoteDetail.cs @@ -1,94 +1,95 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; + using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; -public class StoreCountNoteDetail : AuditedAggregateRoot -{ - public bool Adjusted { get; set; } + public class StoreCountNoteDetail : AuditedAggregateRoot + { + public bool Adjusted { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? AuditCountDescription { get; set; } + public string? AuditCountDescription { get; set; } - public string? AuditCountOperator { get; set; } + public string? AuditCountOperator { get; set; } - public decimal AuditCountQty { get; set; } + public decimal AuditCountQty { get; set; } - public DateTime? AuditCountTime { get; set; } + public DateTime? AuditCountTime { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string CountLabel { get; set; } = null!; + public string CountLabel { get; set; } = null!; - public string? CountPlanNumber { get; set; } + public string? CountPlanNumber { get; set; } - public string DetailStatus { get; set; } = null!; + public string DetailStatus { get; set; } = null!; - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FinalCountQty { get; set; } + public decimal FinalCountQty { get; set; } - public string? FirstCountDescription { get; set; } + public string? FirstCountDescription { get; set; } - public string? FirstCountOperator { get; set; } + public string? FirstCountOperator { get; set; } - public decimal FirstCountQty { get; set; } + public decimal FirstCountQty { get; set; } - public DateTime? FirstCountTime { get; set; } + public DateTime? FirstCountTime { get; set; } - public decimal InventoryQty { get; set; } + public decimal InventoryQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreCountNote Master { get; set; } = null!; + public virtual StoreCountNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RepeatCountDescription { get; set; } + public string? RepeatCountDescription { get; set; } - public string? RepeatCountOperator { get; set; } + public string? RepeatCountOperator { get; set; } - public decimal RepeatCountQty { get; set; } + public decimal RepeatCountQty { get; set; } - public DateTime? RepeatCountTime { get; set; } + public DateTime? RepeatCountTime { get; set; } - public string Stage { get; set; } = null!; + public string Stage { get; set; } = null!; - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs index afc46f70e..e8b7f9a12 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs @@ -1,94 +1,95 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; + using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; -public class StoreCountNoteDetailCopy : AuditedAggregateRoot -{ - public bool Adjusted { get; set; } + public class StoreCountNoteDetailCopy : AuditedAggregateRoot + { + public bool Adjusted { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? AuditCountDescription { get; set; } + public string? AuditCountDescription { get; set; } - public string? AuditCountOperator { get; set; } + public string? AuditCountOperator { get; set; } - public decimal AuditCountQty { get; set; } + public decimal AuditCountQty { get; set; } - public DateTime? AuditCountTime { get; set; } + public DateTime? AuditCountTime { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string CountLabel { get; set; } = null!; + public string CountLabel { get; set; } = null!; - public string? CountPlanNumber { get; set; } + public string? CountPlanNumber { get; set; } - public string DetailStatus { get; set; } = null!; + public string DetailStatus { get; set; } = null!; - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FinalCountQty { get; set; } + public decimal FinalCountQty { get; set; } - public string? FirstCountDescription { get; set; } + public string? FirstCountDescription { get; set; } - public string? FirstCountOperator { get; set; } + public string? FirstCountOperator { get; set; } - public decimal FirstCountQty { get; set; } + public decimal FirstCountQty { get; set; } - public DateTime? FirstCountTime { get; set; } + public DateTime? FirstCountTime { get; set; } - public decimal InventoryQty { get; set; } + public decimal InventoryQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreCountNote Master { get; set; } = null!; + public virtual StoreCountNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RepeatCountDescription { get; set; } + public string? RepeatCountDescription { get; set; } - public string? RepeatCountOperator { get; set; } + public string? RepeatCountOperator { get; set; } - public decimal RepeatCountQty { get; set; } + public decimal RepeatCountQty { get; set; } - public DateTime? RepeatCountTime { get; set; } + public DateTime? RepeatCountTime { get; set; } - public string Stage { get; set; } = null!; + public string Stage { get; set; } = null!; - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlan/StoreCountPlan.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlan/StoreCountPlan.cs index 50d71ab72..904325fbc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlan/StoreCountPlan.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlan/StoreCountPlan.cs @@ -1,56 +1,57 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountPlan; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountPlan +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail; -public class StoreCountPlan : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreCountPlan : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public DateTime? BeginTime { get; set; } + public DateTime? BeginTime { get; set; } - public string CountMethod { get; set; } = null!; + public string CountMethod { get; set; } = null!; - public string? Description { get; set; } + public string? Description { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string? JsonInventoryStatus { get; set; } + public string? JsonInventoryStatus { get; set; } - public string? JsonItemCodes { get; set; } + public string? JsonItemCodes { get; set; } - public string? JsonLocationCodes { get; set; } + public string? JsonLocationCodes { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanTime { get; set; } + public DateTime PlanTime { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string RequestType { get; set; } = null!; + public string RequestType { get; set; } = null!; - public string Stage { get; set; } = null!; + public string Stage { get; set; } = null!; - public virtual ICollection StoreCountPlanDetails { get; set; } = - new List(); + public virtual ICollection StoreCountPlanDetails { get; set; } = + new List(); - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlanDetail/StoreCountPlanDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlanDetail/StoreCountPlanDetail.cs index e53ff32ec..69a429790 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlanDetail/StoreCountPlanDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountPlanDetail/StoreCountPlanDetail.cs @@ -1,90 +1,91 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan; + using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan; -public class StoreCountPlanDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreCountPlanDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? AuditCountDescription { get; set; } + public string? AuditCountDescription { get; set; } - public string? AuditCountOperator { get; set; } + public string? AuditCountOperator { get; set; } - public decimal AuditCountQty { get; set; } + public decimal AuditCountQty { get; set; } - public DateTime? AuditCountTime { get; set; } + public DateTime? AuditCountTime { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string CountLabel { get; set; } = null!; + public string CountLabel { get; set; } = null!; - public int DetailStatus { get; set; } + public int DetailStatus { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FinalCountQty { get; set; } + public decimal FinalCountQty { get; set; } - public string? FirstCountDescription { get; set; } + public string? FirstCountDescription { get; set; } - public string? FirstCountOperator { get; set; } + public string? FirstCountOperator { get; set; } - public decimal FirstCountQty { get; set; } + public decimal FirstCountQty { get; set; } - public DateTime? FirstCountTime { get; set; } + public DateTime? FirstCountTime { get; set; } - public decimal InventoryQty { get; set; } + public decimal InventoryQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreCountPlan Master { get; set; } = null!; + public virtual StoreCountPlan Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RepeatCountDescription { get; set; } + public string? RepeatCountDescription { get; set; } - public string? RepeatCountOperator { get; set; } + public string? RepeatCountOperator { get; set; } - public decimal RepeatCountQty { get; set; } + public decimal RepeatCountQty { get; set; } - public DateTime? RepeatCountTime { get; set; } + public DateTime? RepeatCountTime { get; set; } - public string Stage { get; set; } = null!; + public string Stage { get; set; } = null!; - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsn/StoreCustomerAsn.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsn/StoreCustomerAsn.cs index d1e24644e..b079d2531 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsn/StoreCustomerAsn.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsn/StoreCustomerAsn.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsnDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsnDetail; -public class StoreCustomerAsn : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreCustomerAsn : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime? BeginTime { get; set; } + public DateTime? BeginTime { get; set; } - public string? ContactEmail { get; set; } + public string? ContactEmail { get; set; } - public string? ContactName { get; set; } + public string? ContactName { get; set; } - public string? ContactPhone { get; set; } + public string? ContactPhone { get; set; } - public string CustomerCode { get; set; } = null!; + public string CustomerCode { get; set; } = null!; - public string? DockCode { get; set; } + public string? DockCode { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string SoNumber { get; set; } = null!; + public string SoNumber { get; set; } = null!; - public int Status { get; set; } + public int Status { get; set; } - public virtual ICollection StoreCustomerAsnDetails { get; set; } = - new List(); + public virtual ICollection StoreCustomerAsnDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsnDetail/StoreCustomerAsnDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsnDetail/StoreCustomerAsnDetail.cs index 515a0d079..d0ce2aa14 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsnDetail/StoreCustomerAsnDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerAsnDetail/StoreCustomerAsnDetail.cs @@ -1,36 +1,37 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsnDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsnDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn; + using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn; -public class StoreCustomerAsnDetail : AuditedAggregateRoot -{ - public string ItemCode { get; set; } = null!; + public class StoreCustomerAsnDetail : AuditedAggregateRoot + { + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreCustomerAsn Master { get; set; } = null!; + public virtual StoreCustomerAsn Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SoLine { get; set; } + public string? SoLine { get; set; } - public string? SoNumber { get; set; } + public string? SoNumber { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNote/StoreCustomerReturnNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNote/StoreCustomerReturnNote.cs index 6ba43f771..5345ccc4f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNote/StoreCustomerReturnNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNote/StoreCustomerReturnNote.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNoteDetail; -public class StoreCustomerReturnNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreCustomerReturnNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? Customer { get; set; } + public string? Customer { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public DateTime ReturnTime { get; set; } + public DateTime ReturnTime { get; set; } - public virtual ICollection StoreCustomerReturnNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreCustomerReturnNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNoteDetail/StoreCustomerReturnNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNoteDetail/StoreCustomerReturnNoteDetail.cs index 445f78370..5d702f12a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNoteDetail/StoreCustomerReturnNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCustomerReturnNoteDetail/StoreCustomerReturnNoteDetail.cs @@ -1,76 +1,77 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNote; + using WinIn.FasterZ.Wms.Z_Business.StoreCustomerReturnNote; -public class StoreCustomerReturnNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreCustomerReturnNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreCustomerReturnNote Master { get; set; } = null!; + public virtual StoreCustomerReturnNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNote/StoreDeliverNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNote/StoreDeliverNote.cs index cf26cb6fc..506725bfe 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNote/StoreDeliverNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNote/StoreDeliverNote.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreDeliverNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreDeliverNoteDetail; -public class StoreDeliverNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreDeliverNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public int CountPrint { get; set; } + public int CountPrint { get; set; } - public string? CustomerAddressCode { get; set; } + public string? CustomerAddressCode { get; set; } - public string CustomerCode { get; set; } = null!; + public string CustomerCode { get; set; } = null!; - public string? DeliverPlanNumber { get; set; } + public string? DeliverPlanNumber { get; set; } - public string? DeliverRequestNumber { get; set; } + public string? DeliverRequestNumber { get; set; } - public string DeliverRequestType { get; set; } = null!; + public string DeliverRequestType { get; set; } = null!; - public DateTime DeliverTime { get; set; } + public DateTime DeliverTime { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreDeliverNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreDeliverNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNoteDetail/StoreDeliverNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNoteDetail/StoreDeliverNoteDetail.cs index be53c8a97..b2515cdbd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNoteDetail/StoreDeliverNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverNoteDetail/StoreDeliverNoteDetail.cs @@ -1,128 +1,129 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreDeliverNote; + using WinIn.FasterZ.Wms.Z_Business.StoreDeliverNote; -public class StoreDeliverNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreDeliverNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string FromLot { get; set; } = null!; + public string FromLot { get; set; } = null!; - public string FromPackingCode { get; set; } = null!; + public string FromPackingCode { get; set; } = null!; - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreDeliverNote Master { get; set; } = null!; + public virtual StoreDeliverNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string ToLot { get; set; } = null!; + public string ToLot { get; set; } = null!; - public string ToPackingCode { get; set; } = null!; + public string ToPackingCode { get; set; } = null!; - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlan/StoreDeliverPlan.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlan/StoreDeliverPlan.cs index 3df74d147..a71e1757f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlan/StoreDeliverPlan.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlan/StoreDeliverPlan.cs @@ -1,46 +1,47 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlan; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlan +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlanDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlanDetail; -public class StoreDeliverPlan : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreDeliverPlan : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public string CustomerAddressCode { get; set; } = null!; + public string CustomerAddressCode { get; set; } = null!; - public string CustomerCode { get; set; } = null!; + public string CustomerCode { get; set; } = null!; - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanDate { get; set; } + public DateTime PlanDate { get; set; } - public DateTime PlanTime { get; set; } + public DateTime PlanTime { get; set; } - public string Project { get; set; } = null!; + public string Project { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string SoNumber { get; set; } = null!; + public string SoNumber { get; set; } = null!; - public virtual ICollection StoreDeliverPlanDetails { get; set; } = - new List(); + public virtual ICollection StoreDeliverPlanDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlanDetail/StoreDeliverPlanDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlanDetail/StoreDeliverPlanDetail.cs index fed56b45b..7d109d6c8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlanDetail/StoreDeliverPlanDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverPlanDetail/StoreDeliverPlanDetail.cs @@ -1,36 +1,37 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlanDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlanDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlan; + using WinIn.FasterZ.Wms.Z_Business.StoreDeliverPlan; -public class StoreDeliverPlanDetail : AuditedAggregateRoot -{ - public string ItemCode { get; set; } = null!; + public class StoreDeliverPlanDetail : AuditedAggregateRoot + { + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreDeliverPlan Master { get; set; } = null!; + public virtual StoreDeliverPlan Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SoLine { get; set; } + public string? SoLine { get; set; } - public string? SoNumber { get; set; } + public string? SoNumber { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequest/StoreDeliverRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequest/StoreDeliverRequest.cs index ee64fe6d3..1356244f4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequest/StoreDeliverRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequest/StoreDeliverRequest.cs @@ -1,44 +1,45 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequestDetail; -public class StoreDeliverRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreDeliverRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public string? CustomerAddressCode { get; set; } + public string? CustomerAddressCode { get; set; } - public string CustomerCode { get; set; } = null!; + public string CustomerCode { get; set; } = null!; - public string? DeliverPlanNumber { get; set; } + public string? DeliverPlanNumber { get; set; } - public string DeliverRequestType { get; set; } = null!; + public string DeliverRequestType { get; set; } = null!; - public DateTime DeliverTime { get; set; } + public DateTime DeliverTime { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreDeliverRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreDeliverRequestDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequestDetail/StoreDeliverRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequestDetail/StoreDeliverRequestDetail.cs index 75683563f..8e75f9e79 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequestDetail/StoreDeliverRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreDeliverRequestDetail/StoreDeliverRequestDetail.cs @@ -1,34 +1,35 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreDeliverRequest; -public class StoreDeliverRequestDetail : AuditedAggregateRoot -{ - public string? AreaCode { get; set; } + public class StoreDeliverRequestDetail : AuditedAggregateRoot + { + public string? AreaCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreDeliverRequest Master { get; set; } = null!; + public virtual StoreDeliverRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreExchangeDatum/StoreExchangeDatum.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreExchangeDatum/StoreExchangeDatum.cs index 0e8a6ce20..1e9bebe8a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreExchangeDatum/StoreExchangeDatum.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreExchangeDatum/StoreExchangeDatum.cs @@ -1,44 +1,45 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreExchangeDatum; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreExchangeDatum +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class StoreExchangeDatum : AuditedAggregateRoot -{ - public int DataAction { get; set; } + public class StoreExchangeDatum : AuditedAggregateRoot + { + public int DataAction { get; set; } - public string? DataContent { get; set; } + public string? DataContent { get; set; } - public string DataIdentityCode { get; set; } = null!; + public string DataIdentityCode { get; set; } = null!; - public string DataType { get; set; } = null!; + public string DataType { get; set; } = null!; - public string DestinationSystem { get; set; } = null!; + public string DestinationSystem { get; set; } = null!; - public DateTime EffectiveDate { get; set; } + public DateTime EffectiveDate { get; set; } - public string ErrorCode { get; set; } = null!; + public string ErrorCode { get; set; } = null!; - public string? ErrorMessage { get; set; } + public string? ErrorMessage { get; set; } - public long Number { get; set; } + public long Number { get; set; } - public string? Reader { get; set; } + public string? Reader { get; set; } - public DateTime? ReadTime { get; set; } + public DateTime? ReadTime { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public int RetryTimes { get; set; } + public int RetryTimes { get; set; } - public string SourceSystem { get; set; } = null!; + public string SourceSystem { get; set; } = null!; - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string? TyrpNumber { get; set; } + public string? TyrpNumber { get; set; } - public string? Writer { get; set; } + public string? Writer { get; set; } - public DateTime WriteTime { get; set; } + public DateTime WriteTime { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNote/StoreInspectAbnormalNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNote/StoreInspectAbnormalNote.cs index ad5128f08..9730ed1fc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNote/StoreInspectAbnormalNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNote/StoreInspectAbnormalNote.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNoteDetail; -public class StoreInspectAbnormalNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreInspectAbnormalNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? InspectNumber { get; set; } + public string? InspectNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ReceiptNumber { get; set; } + public string? ReceiptNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreInspectAbnormalNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreInspectAbnormalNoteDetails { get; set; } = + new List(); - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNoteDetail/StoreInspectAbnormalNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNoteDetail/StoreInspectAbnormalNoteDetail.cs index 83a401415..ba39191a6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNoteDetail/StoreInspectAbnormalNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectAbnormalNoteDetail/StoreInspectAbnormalNoteDetail.cs @@ -1,50 +1,51 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNote; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectAbnormalNote; -public class StoreInspectAbnormalNoteDetail : AuditedAggregateRoot -{ - public string AbnormalType { get; set; } = null!; + public class StoreInspectAbnormalNoteDetail : AuditedAggregateRoot + { + public string AbnormalType { get; set; } = null!; - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreInspectAbnormalNote Master { get; set; } = null!; + public virtual StoreInspectAbnormalNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? Photos { get; set; } + public string? Photos { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNote/StoreInspectNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNote/StoreInspectNote.cs index 301ae66ba..f83181c35 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNote/StoreInspectNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNote/StoreInspectNote.cs @@ -1,44 +1,45 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteSummaryDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteSummaryDetail; -public class StoreInspectNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreInspectNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public string? InspectNumber { get; set; } + public string? InspectNumber { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string NextAction { get; set; } = null!; + public string NextAction { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public string? ReceiptNumber { get; set; } + public string? ReceiptNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public virtual ICollection StoreInspectNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreInspectNoteDetails { get; set; } = + new List(); - public virtual ICollection StoreInspectNoteSummaryDetails { get; set; } = - new List(); + public virtual ICollection StoreInspectNoteSummaryDetails { get; set; } = + new List(); - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteDetail/StoreInspectNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteDetail/StoreInspectNoteDetail.cs index 212c12673..1990cfea2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteDetail/StoreInspectNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteDetail/StoreInspectNoteDetail.cs @@ -1,96 +1,97 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectNote; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectNote; -public class StoreInspectNoteDetail : AuditedAggregateRoot -{ - public string? AbcClass { get; set; } + public class StoreInspectNoteDetail : AuditedAggregateRoot + { + public string? AbcClass { get; set; } - public string? Appearance { get; set; } + public string? Appearance { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public decimal CrackQty { get; set; } + public decimal CrackQty { get; set; } - public string DetailInspectStatus { get; set; } = null!; + public string DetailInspectStatus { get; set; } = null!; - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FailedQty { get; set; } + public decimal FailedQty { get; set; } - public string? FailedReason { get; set; } + public string? FailedReason { get; set; } - public decimal GoodQty { get; set; } + public decimal GoodQty { get; set; } - public DateTime? InspectDate { get; set; } + public DateTime? InspectDate { get; set; } - public decimal InspectQty { get; set; } + public decimal InspectQty { get; set; } - public string InspectType { get; set; } = null!; + public string InspectType { get; set; } = null!; - public string? InspectUser { get; set; } + public string? InspectUser { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreInspectNote Master { get; set; } = null!; + public virtual StoreInspectNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public decimal NotPassedQty { get; set; } + public decimal NotPassedQty { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OtherPropertyJson { get; set; } + public string? OtherPropertyJson { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? Photos { get; set; } + public string? Photos { get; set; } - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal ReceiveQty { get; set; } + public decimal ReceiveQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SamplePercent { get; set; } + public decimal SamplePercent { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } - public string? Volume { get; set; } + public string? Volume { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; - public string? Weight { get; set; } + public string? Weight { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteSummaryDetail/StoreInspectNoteSummaryDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteSummaryDetail/StoreInspectNoteSummaryDetail.cs index 24475e4ba..6d4fefa29 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteSummaryDetail/StoreInspectNoteSummaryDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectNoteSummaryDetail/StoreInspectNoteSummaryDetail.cs @@ -1,68 +1,69 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteSummaryDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectNoteSummaryDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectNote; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectNote; -public class StoreInspectNoteSummaryDetail : AuditedAggregateRoot -{ - public string? AbcClass { get; set; } + public class StoreInspectNoteSummaryDetail : AuditedAggregateRoot + { + public string? AbcClass { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public decimal CrackQty { get; set; } + public decimal CrackQty { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FailedQty { get; set; } + public decimal FailedQty { get; set; } - public string? FailedReason { get; set; } + public string? FailedReason { get; set; } - public decimal GoodQty { get; set; } + public decimal GoodQty { get; set; } - public decimal InspectQty { get; set; } + public decimal InspectQty { get; set; } - public string InspectType { get; set; } = null!; + public string InspectType { get; set; } = null!; - public string? InspectUser { get; set; } + public string? InspectUser { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreInspectNote Master { get; set; } = null!; + public virtual StoreInspectNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public decimal NotPassedQty { get; set; } + public decimal NotPassedQty { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal ReceiveQty { get; set; } + public decimal ReceiveQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SamplePercent { get; set; } + public decimal SamplePercent { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string SummaryInspectStatus { get; set; } = null!; + public string SummaryInspectStatus { get; set; } = null!; - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequest/StoreInspectRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequest/StoreInspectRequest.cs index ed763cf49..5ab3cb4e4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequest/StoreInspectRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequest/StoreInspectRequest.cs @@ -1,52 +1,53 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestSummaryDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestSummaryDetail; -public class StoreInspectRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreInspectRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public string ReceiptNumber { get; set; } = null!; + public string ReceiptNumber { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public virtual ICollection StoreInspectRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreInspectRequestDetails { get; set; } = + new List(); - public virtual ICollection StoreInspectRequestSummaryDetails { get; set; } = - new List(); + public virtual ICollection StoreInspectRequestSummaryDetails { get; set; } = + new List(); - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestDetail/StoreInspectRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestDetail/StoreInspectRequestDetail.cs index 8e3d6827f..ebc5dc6d4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestDetail/StoreInspectRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestDetail/StoreInspectRequestDetail.cs @@ -1,74 +1,75 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequest; -public class StoreInspectRequestDetail : AuditedAggregateRoot -{ - public string? AbcClass { get; set; } + public class StoreInspectRequestDetail : AuditedAggregateRoot + { + public string? AbcClass { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? Attributes { get; set; } + public string? Attributes { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public string DetailInspectStatus { get; set; } = null!; + public string DetailInspectStatus { get; set; } = null!; - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal InspectQty { get; set; } + public decimal InspectQty { get; set; } - public string InspectType { get; set; } = null!; + public string InspectType { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreInspectRequest Master { get; set; } = null!; + public virtual StoreInspectRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal ReceiveQty { get; set; } + public decimal ReceiveQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SamplePercent { get; set; } + public decimal SamplePercent { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestSummaryDetail/StoreInspectRequestSummaryDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestSummaryDetail/StoreInspectRequestSummaryDetail.cs index 06b0416f5..0ad9ef416 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestSummaryDetail/StoreInspectRequestSummaryDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInspectRequestSummaryDetail/StoreInspectRequestSummaryDetail.cs @@ -1,66 +1,67 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestSummaryDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInspectRequestSummaryDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreInspectRequest; -public class StoreInspectRequestSummaryDetail : AuditedAggregateRoot -{ - public string? AbcClass { get; set; } + public class StoreInspectRequestSummaryDetail : AuditedAggregateRoot + { + public string? AbcClass { get; set; } - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public decimal CrackQty { get; set; } + public decimal CrackQty { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal FailedQty { get; set; } + public decimal FailedQty { get; set; } - public decimal GoodQty { get; set; } + public decimal GoodQty { get; set; } - public decimal InspectQty { get; set; } + public decimal InspectQty { get; set; } - public string? InspectReport { get; set; } + public string? InspectReport { get; set; } - public string InspectType { get; set; } = null!; + public string InspectType { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreInspectRequest Master { get; set; } = null!; + public virtual StoreInspectRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public decimal NotPassedQty { get; set; } + public decimal NotPassedQty { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal ReceiveQty { get; set; } + public decimal ReceiveQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal SamplePercent { get; set; } + public decimal SamplePercent { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string SummaryInspectStatus { get; set; } = null!; + public string SummaryInspectStatus { get; set; } = null!; - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNote/StoreInventoryInitialNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNote/StoreInventoryInitialNote.cs index 0f71a190a..186278737 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNote/StoreInventoryInitialNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNote/StoreInventoryInitialNote.cs @@ -1,24 +1,25 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNoteDetail; -public class StoreInventoryInitialNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreInventoryInitialNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public virtual ICollection StoreInventoryInitialNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreInventoryInitialNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNoteDetail/StoreInventoryInitialNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNoteDetail/StoreInventoryInitialNoteDetail.cs index 08d712988..ec7df90b6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNoteDetail/StoreInventoryInitialNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryInitialNoteDetail/StoreInventoryInitialNoteDetail.cs @@ -1,58 +1,59 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNote; + using WinIn.FasterZ.Wms.Z_Business.StoreInventoryInitialNote; -public class StoreInventoryInitialNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreInventoryInitialNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreInventoryInitialNote Master { get; set; } = null!; + public virtual StoreInventoryInitialNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNote/StoreInventoryTransferNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNote/StoreInventoryTransferNote.cs index d00bf366d..9d0dbf7d9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNote/StoreInventoryTransferNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNote/StoreInventoryTransferNote.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNoteDetail; -public class StoreInventoryTransferNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreInventoryTransferNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreInventoryTransferNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreInventoryTransferNoteDetails { get; set; } = + new List(); - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string TransferType { get; set; } = null!; + public string TransferType { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNoteDetail/StoreInventoryTransferNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNoteDetail/StoreInventoryTransferNoteDetail.cs index 1601ce2b7..28b212eaa 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNoteDetail/StoreInventoryTransferNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreInventoryTransferNoteDetail/StoreInventoryTransferNoteDetail.cs @@ -1,78 +1,79 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNote; + using WinIn.FasterZ.Wms.Z_Business.StoreInventoryTransferNote; -public class StoreInventoryTransferNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreInventoryTransferNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreInventoryTransferNote Master { get; set; } = null!; + public virtual StoreInventoryTransferNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNote/StoreIsolationNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNote/StoreIsolationNote.cs index 4ee132547..7af2b709b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNote/StoreIsolationNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNote/StoreIsolationNote.cs @@ -1,24 +1,25 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreIsolationNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreIsolationNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreIsolationNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreIsolationNoteDetail; -public class StoreIsolationNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreIsolationNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreIsolationNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreIsolationNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNoteDetail/StoreIsolationNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNoteDetail/StoreIsolationNoteDetail.cs index 4ba2a3f33..8ccdef5a7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNoteDetail/StoreIsolationNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIsolationNoteDetail/StoreIsolationNoteDetail.cs @@ -1,76 +1,77 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreIsolationNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreIsolationNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreIsolationNote; + using WinIn.FasterZ.Wms.Z_Business.StoreIsolationNote; -public class StoreIsolationNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreIsolationNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreIsolationNote Master { get; set; } = null!; + public virtual StoreIsolationNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNote/StoreIssueNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNote/StoreIssueNote.cs index 03cde6160..4d0162cac 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNote/StoreIssueNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNote/StoreIssueNote.cs @@ -1,36 +1,37 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreIssueNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreIssueNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreIssueNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreIssueNoteDetail; -public class StoreIssueNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreIssueNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool Confirmed { get; set; } + public bool Confirmed { get; set; } - public DateTime? ConfirmTime { get; set; } + public DateTime? ConfirmTime { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public string? RequestType { get; set; } + public string? RequestType { get; set; } - public virtual ICollection StoreIssueNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreIssueNoteDetails { get; set; } = + new List(); - public bool UseOnTheWayLocation { get; set; } + public bool UseOnTheWayLocation { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? Workshop { get; set; } + public string? Workshop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNoteDetail/StoreIssueNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNoteDetail/StoreIssueNoteDetail.cs index 7bdb62b6f..b8e7a981b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNoteDetail/StoreIssueNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreIssueNoteDetail/StoreIssueNoteDetail.cs @@ -1,138 +1,139 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreIssueNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreIssueNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreIssueNote; + using WinIn.FasterZ.Wms.Z_Business.StoreIssueNote; -public class StoreIssueNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreIssueNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public DateTime ExpiredTime { get; set; } + public DateTime ExpiredTime { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public DateTime IssueTime { get; set; } + public DateTime IssueTime { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreIssueNote Master { get; set; } = null!; + public virtual StoreIssueNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnTheWayLocationCode { get; set; } + public string? OnTheWayLocationCode { get; set; } - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string? WorkStation { get; set; } + public string? WorkStation { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNote/StoreItemTransformNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNote/StoreItemTransformNote.cs index 8f70e390f..dd773e9d9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNote/StoreItemTransformNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNote/StoreItemTransformNote.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNoteDetail; -public class StoreItemTransformNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreItemTransformNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public virtual ICollection StoreItemTransformNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreItemTransformNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNoteDetail/StoreItemTransformNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNoteDetail/StoreItemTransformNoteDetail.cs index ac1b17c7e..1572ff1f8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNoteDetail/StoreItemTransformNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformNoteDetail/StoreItemTransformNoteDetail.cs @@ -1,94 +1,95 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNote; + using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformNote; -public class StoreItemTransformNoteDetail : AuditedAggregateRoot -{ - public DateTime FromArriveDate { get; set; } + public class StoreItemTransformNoteDetail : AuditedAggregateRoot + { + public DateTime FromArriveDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public DateTime FromExpireDate { get; set; } + public DateTime FromExpireDate { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public DateTime FromProduceDate { get; set; } + public DateTime FromProduceDate { get; set; } - public decimal FromQty { get; set; } + public decimal FromQty { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string? FromSupplierBatch { get; set; } + public string? FromSupplierBatch { get; set; } - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreItemTransformNote Master { get; set; } = null!; + public virtual StoreItemTransformNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public DateTime ToArriveDate { get; set; } + public DateTime ToArriveDate { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public DateTime ToExpireDate { get; set; } + public DateTime ToExpireDate { get; set; } - public string? ToItemCode { get; set; } + public string? ToItemCode { get; set; } - public string? ToItemDesc1 { get; set; } + public string? ToItemDesc1 { get; set; } - public string? ToItemDesc2 { get; set; } + public string? ToItemDesc2 { get; set; } - public string? ToItemName { get; set; } + public string? ToItemName { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public DateTime ToProduceDate { get; set; } + public DateTime ToProduceDate { get; set; } - public decimal ToQty { get; set; } + public decimal ToQty { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string? ToSupplierBatch { get; set; } + public string? ToSupplierBatch { get; set; } - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequest/StoreItemTransformRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequest/StoreItemTransformRequest.cs index dd0016e51..8b633d1e5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequest/StoreItemTransformRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequest/StoreItemTransformRequest.cs @@ -1,34 +1,35 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequestDetail; -public class StoreItemTransformRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreItemTransformRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreItemTransformRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreItemTransformRequestDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequestDetail/StoreItemTransformRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequestDetail/StoreItemTransformRequestDetail.cs index 3944f7237..b3a6707e4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequestDetail/StoreItemTransformRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreItemTransformRequestDetail/StoreItemTransformRequestDetail.cs @@ -1,94 +1,95 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreItemTransformRequest; -public class StoreItemTransformRequestDetail : AuditedAggregateRoot -{ - public DateTime FromArriveDate { get; set; } + public class StoreItemTransformRequestDetail : AuditedAggregateRoot + { + public DateTime FromArriveDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public DateTime FromExpireDate { get; set; } + public DateTime FromExpireDate { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public DateTime FromProduceDate { get; set; } + public DateTime FromProduceDate { get; set; } - public decimal FromQty { get; set; } + public decimal FromQty { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string? FromSupplierBatch { get; set; } + public string? FromSupplierBatch { get; set; } - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreItemTransformRequest Master { get; set; } = null!; + public virtual StoreItemTransformRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public DateTime ToArriveDate { get; set; } + public DateTime ToArriveDate { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public DateTime ToExpireDate { get; set; } + public DateTime ToExpireDate { get; set; } - public string? ToItemCode { get; set; } + public string? ToItemCode { get; set; } - public string? ToItemDesc1 { get; set; } + public string? ToItemDesc1 { get; set; } - public string? ToItemDesc2 { get; set; } + public string? ToItemDesc2 { get; set; } - public string? ToItemName { get; set; } + public string? ToItemName { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public DateTime ToProduceDate { get; set; } + public DateTime ToProduceDate { get; set; } - public decimal ToQty { get; set; } + public decimal ToQty { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string? ToSupplierBatch { get; set; } + public string? ToSupplierBatch { get; set; } - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNote/StoreJisDeliverNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNote/StoreJisDeliverNote.cs index 997b9fbd5..b08baeb02 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNote/StoreJisDeliverNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNote/StoreJisDeliverNote.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNoteDetail; -public class StoreJisDeliverNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreJisDeliverNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime ArrivalTime { get; set; } + public DateTime ArrivalTime { get; set; } - public decimal ContainerQty { get; set; } + public decimal ContainerQty { get; set; } - public string Customer { get; set; } = null!; + public string Customer { get; set; } = null!; - public string CustomerAddressCode { get; set; } = null!; + public string CustomerAddressCode { get; set; } = null!; - public DateTime DeliverTime { get; set; } + public DateTime DeliverTime { get; set; } - public decimal ItemQty { get; set; } + public decimal ItemQty { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreJisDeliverNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreJisDeliverNoteDetails { get; set; } = + new List(); - public string? TotalPackCapacity { get; set; } + public string? TotalPackCapacity { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNoteDetail/StoreJisDeliverNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNoteDetail/StoreJisDeliverNoteDetail.cs index 462613852..cfca38633 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNoteDetail/StoreJisDeliverNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisDeliverNoteDetail/StoreJisDeliverNoteDetail.cs @@ -1,98 +1,99 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNote; + using WinIn.FasterZ.Wms.Z_Business.StoreJisDeliverNote; -public class StoreJisDeliverNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreJisDeliverNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime DeliverTime { get; set; } + public DateTime DeliverTime { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public DateTime ExpiredTime { get; set; } + public DateTime ExpiredTime { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreJisDeliverNote Master { get; set; } = null!; + public virtual StoreJisDeliverNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnlineType { get; set; } + public string? OnlineType { get; set; } - public string? PackCapacity { get; set; } + public string? PackCapacity { get; set; } - public string? Position { get; set; } + public string? Position { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProductNo { get; set; } + public string? ProductNo { get; set; } - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SeqNo { get; set; } + public string? SeqNo { get; set; } - public string? Stage { get; set; } + public string? Stage { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string? UsedFor { get; set; } + public string? UsedFor { get; set; } - public string? Year { get; set; } + public string? Year { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNote/StoreJisProductReceiptNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNote/StoreJisProductReceiptNote.cs index c1ffc54c3..735a0b617 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNote/StoreJisProductReceiptNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNote/StoreJisProductReceiptNote.cs @@ -1,48 +1,49 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNoteDetail; -public class StoreJisProductReceiptNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreJisProductReceiptNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime CompleteTime { get; set; } + public DateTime CompleteTime { get; set; } - public decimal ContainerQty { get; set; } + public decimal ContainerQty { get; set; } - public decimal ItemQty { get; set; } + public decimal ItemQty { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string? LocationCode { get; set; } + public string? LocationCode { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public string? ProductionPlanNumber { get; set; } + public string? ProductionPlanNumber { get; set; } - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public string ReceiptType { get; set; } = null!; + public string ReceiptType { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Shift { get; set; } + public string? Shift { get; set; } - public string? SourceNumber { get; set; } + public string? SourceNumber { get; set; } - public virtual ICollection StoreJisProductReceiptNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreJisProductReceiptNoteDetails { get; set; } = + new List(); - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string WorkShop { get; set; } = null!; + public string WorkShop { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNoteDetail/StoreJisProductReceiptNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNoteDetail/StoreJisProductReceiptNoteDetail.cs index 623988524..0791486f1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNoteDetail/StoreJisProductReceiptNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreJisProductReceiptNoteDetail/StoreJisProductReceiptNoteDetail.cs @@ -1,74 +1,75 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNote; + using WinIn.FasterZ.Wms.Z_Business.StoreJisProductReceiptNote; -public class StoreJisProductReceiptNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreJisProductReceiptNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? BomVersion { get; set; } + public string? BomVersion { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreJisProductReceiptNote Master { get; set; } = null!; + public virtual StoreJisProductReceiptNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? Position { get; set; } + public string? Position { get; set; } - public string ProdLine { get; set; } = null!; + public string ProdLine { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProductNo { get; set; } + public string? ProductNo { get; set; } - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string RawLocationCode { get; set; } = null!; + public string RawLocationCode { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SeqNo { get; set; } + public string? SeqNo { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; - public string? Year { get; set; } + public string? Year { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequest/StoreMaterialRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequest/StoreMaterialRequest.cs index 340a83135..c4e0bd306 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequest/StoreMaterialRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequest/StoreMaterialRequest.cs @@ -1,44 +1,45 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequestDetail; -public class StoreMaterialRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreMaterialRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PreparationPlanNumber { get; set; } + public string? PreparationPlanNumber { get; set; } - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreMaterialRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreMaterialRequestDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public bool UseOnTheWayLocation { get; set; } + public bool UseOnTheWayLocation { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? Workshop { get; set; } + public string? Workshop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequestDetail/StoreMaterialRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequestDetail/StoreMaterialRequestDetail.cs index 57e13bb5d..0afef1433 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequestDetail/StoreMaterialRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreMaterialRequestDetail/StoreMaterialRequestDetail.cs @@ -1,56 +1,57 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreMaterialRequest; -public class StoreMaterialRequestDetail : AuditedAggregateRoot -{ - public DateTime ExpiredTime { get; set; } + public class StoreMaterialRequestDetail : AuditedAggregateRoot + { + public DateTime ExpiredTime { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public decimal IssuedQty { get; set; } + public decimal IssuedQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreMaterialRequest Master { get; set; } = null!; + public virtual StoreMaterialRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public decimal ReceivedQty { get; set; } + public decimal ReceivedQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string ToLocationArea { get; set; } = null!; + public string ToLocationArea { get; set; } = null!; - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string ToLocationGroup { get; set; } = null!; + public string ToLocationGroup { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string? WorkStation { get; set; } + public string? WorkStation { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNote/StoreNoOkConvertOkNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNote/StoreNoOkConvertOkNote.cs index c52d1b795..c0a62802f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNote/StoreNoOkConvertOkNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNote/StoreNoOkConvertOkNote.cs @@ -1,22 +1,23 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNoteDetail; -public class StoreNoOkConvertOkNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreNoOkConvertOkNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreNoOkConvertOkNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreNoOkConvertOkNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNoteDetail/StoreNoOkConvertOkNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNoteDetail/StoreNoOkConvertOkNoteDetail.cs index fc688a271..f2d6dba75 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNoteDetail/StoreNoOkConvertOkNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreNoOkConvertOkNoteDetail/StoreNoOkConvertOkNoteDetail.cs @@ -1,76 +1,77 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNote; + using WinIn.FasterZ.Wms.Z_Business.StoreNoOkConvertOkNote; -public class StoreNoOkConvertOkNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreNoOkConvertOkNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreNoOkConvertOkNote Master { get; set; } = null!; + public virtual StoreNoOkConvertOkNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNote/StoreOfflineSettlementNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNote/StoreOfflineSettlementNote.cs index ba559f978..ff906089f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNote/StoreOfflineSettlementNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNote/StoreOfflineSettlementNote.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNoteDetail; -public class StoreOfflineSettlementNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreOfflineSettlementNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string ProductReceiptNumber { get; set; } = null!; + public string ProductReceiptNumber { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreOfflineSettlementNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreOfflineSettlementNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNoteDetail/StoreOfflineSettlementNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNoteDetail/StoreOfflineSettlementNoteDetail.cs index dee6ec51a..608b9b845 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNoteDetail/StoreOfflineSettlementNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreOfflineSettlementNoteDetail/StoreOfflineSettlementNoteDetail.cs @@ -1,58 +1,59 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNote; + using WinIn.FasterZ.Wms.Z_Business.StoreOfflineSettlementNote; -public class StoreOfflineSettlementNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreOfflineSettlementNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreOfflineSettlementNote Master { get; set; } = null!; + public virtual StoreOfflineSettlementNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlan/StorePreparationPlan.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlan/StorePreparationPlan.cs index cd986665f..88e5ee9e4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlan/StorePreparationPlan.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlan/StorePreparationPlan.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePreparationPlan; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePreparationPlan +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePreparationPlanDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePreparationPlanDetail; -public class StorePreparationPlan : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePreparationPlan : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanDate { get; set; } + public DateTime PlanDate { get; set; } - public DateTime PlanTime { get; set; } + public DateTime PlanTime { get; set; } - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public string ProductionPlanNumber { get; set; } = null!; + public string ProductionPlanNumber { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Shift { get; set; } + public string? Shift { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public virtual ICollection StorePreparationPlanDetails { get; set; } = - new List(); + public virtual ICollection StorePreparationPlanDetails { get; set; } = + new List(); - public string? Team { get; set; } + public string? Team { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? Workshop { get; set; } + public string? Workshop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlanDetail/StorePreparationPlanDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlanDetail/StorePreparationPlanDetail.cs index b02a0896d..f70408214 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlanDetail/StorePreparationPlanDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePreparationPlanDetail/StorePreparationPlanDetail.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePreparationPlanDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePreparationPlanDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePreparationPlan; + using WinIn.FasterZ.Wms.Z_Business.StorePreparationPlan; -public class StorePreparationPlanDetail : AuditedAggregateRoot -{ - public string ItemCode { get; set; } = null!; + public class StorePreparationPlanDetail : AuditedAggregateRoot + { + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public DateTime LatestTime { get; set; } + public DateTime LatestTime { get; set; } - public string LineStatus { get; set; } = null!; + public string LineStatus { get; set; } = null!; - public virtual StorePreparationPlan Master { get; set; } = null!; + public virtual StorePreparationPlan Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WorkStation { get; set; } = null!; + public string WorkStation { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote.cs index c26357b0e..b7d6cc6f4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote.cs @@ -1,44 +1,45 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail; -public class StoreProductL7partsNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductL7partsNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? Configuration { get; set; } + public string? Configuration { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime CreateDate { get; set; } + public DateTime CreateDate { get; set; } - public string? Fata { get; set; } + public string? Fata { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Position { get; set; } + public string? Position { get; set; } - public string? ProductNo { get; set; } + public string? ProductNo { get; set; } - public string? Program { get; set; } + public string? Program { get; set; } - public string? ReceiptNumber { get; set; } + public string? ReceiptNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public int State { get; set; } + public int State { get; set; } - public int Status { get; set; } + public int Status { get; set; } - public virtual ICollection StoreProductL7partsNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreProductL7partsNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? Year { get; set; } + public string? Year { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetail.cs index 538fca716..1002ecadd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetail.cs @@ -1,56 +1,57 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote; + using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote; -public class StoreProductL7partsNoteDetail : AuditedAggregateRoot -{ - public bool CanBuy { get; set; } + public class StoreProductL7partsNoteDetail : AuditedAggregateRoot + { + public bool CanBuy { get; set; } - public bool CanMake { get; set; } + public bool CanMake { get; set; } - public string? Configuration { get; set; } + public string? Configuration { get; set; } - public DateTime CreateDate { get; set; } + public DateTime CreateDate { get; set; } - public string? Fata { get; set; } + public string? Fata { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? L7part { get; set; } + public string? L7part { get; set; } - public string? LocationCode { get; set; } + public string? LocationCode { get; set; } - public virtual StoreProductL7partsNote Master { get; set; } = null!; + public virtual StoreProductL7partsNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Position { get; set; } + public string? Position { get; set; } - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public string? ProductNo { get; set; } + public string? ProductNo { get; set; } - public string? Program { get; set; } + public string? Program { get; set; } - public int Qty { get; set; } + public int Qty { get; set; } - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public int RowId { get; set; } + public int RowId { get; set; } - public int State { get; set; } + public int State { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote.cs index 1e6ec8837..7a145af84 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote.cs @@ -1,42 +1,43 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail; -public class StoreProductReceiptNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductReceiptNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime CompleteTime { get; set; } + public DateTime CompleteTime { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ProductionPlanNumber { get; set; } + public string? ProductionPlanNumber { get; set; } - public string? ProductReceiptRequestNumber { get; set; } + public string? ProductReceiptRequestNumber { get; set; } - public string ReceiptType { get; set; } = null!; + public string ReceiptType { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? Shift { get; set; } + public string? Shift { get; set; } - public string? SourceNumber { get; set; } + public string? SourceNumber { get; set; } - public virtual ICollection StoreProductReceiptNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreProductReceiptNoteDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkShop { get; set; } + public string? WorkShop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetail.cs index a9d473389..ad7dc78cd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetail.cs @@ -1,120 +1,121 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote; + using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote; -public class StoreProductReceiptNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreProductReceiptNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? BomVersion { get; set; } + public string? BomVersion { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreProductReceiptNote Master { get; set; } = null!; + public virtual StoreProductReceiptNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? RawArea { get; set; } + public string? RawArea { get; set; } - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal ReturnQty { get; set; } + public decimal ReturnQty { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest.cs index 3bb848b26..88904bd39 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest.cs @@ -1,48 +1,49 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail; -public class StoreProductReceiptRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductReceiptRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanDate { get; set; } + public DateTime PlanDate { get; set; } - public string? ProdLine { get; set; } + public string? ProdLine { get; set; } - public string? ProductionPlanNumber { get; set; } + public string? ProductionPlanNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string? Shift { get; set; } + public string? Shift { get; set; } - public virtual ICollection StoreProductReceiptRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreProductReceiptRequestDetails { get; set; } = + new List(); - public string? Team { get; set; } + public string? Team { get; set; } - public string? Type { get; set; } + public string? Type { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? Workshop { get; set; } + public string? Workshop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetail.cs index a5489beaa..f0d587faa 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetail.cs @@ -1,58 +1,59 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest; -public class StoreProductReceiptRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreProductReceiptRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? BomVersion { get; set; } + public string? BomVersion { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreProductReceiptRequest Master { get; set; } = null!; + public virtual StoreProductReceiptRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? RawArea { get; set; } + public string? RawArea { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal ReturnQty { get; set; } + public decimal ReturnQty { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetail.cs index c21f701dd..55bbf24c7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetail.cs @@ -1,72 +1,73 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote; + using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote; -public class StoreProductRecycleMaterialDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreProductRecycleMaterialDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? BomVersion { get; set; } + public string? BomVersion { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreProductRecycleNote Master { get; set; } = null!; + public virtual StoreProductRecycleNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProductItemCode { get; set; } + public string? ProductItemCode { get; set; } - public string? ProductItemDesc1 { get; set; } + public string? ProductItemDesc1 { get; set; } - public string? ProductItemDesc2 { get; set; } + public string? ProductItemDesc2 { get; set; } - public string? ProductItemName { get; set; } + public string? ProductItemName { get; set; } - public string? ProductLot { get; set; } + public string? ProductLot { get; set; } - public string? ProductPackingCode { get; set; } + public string? ProductPackingCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote.cs index bb01d353f..fd1d089fa 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote.cs @@ -1,34 +1,35 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail; -public class StoreProductRecycleNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductRecycleNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime RecycleTime { get; set; } + public DateTime RecycleTime { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public string? Shift { get; set; } + public string? Shift { get; set; } - public virtual ICollection StoreProductRecycleMaterialDetails { get; set; } = - new List(); + public virtual ICollection StoreProductRecycleMaterialDetails { get; set; } = + new List(); - public virtual ICollection StoreProductRecycleNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreProductRecycleNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? Workshop { get; set; } + public string? Workshop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetail.cs index bc6d53544..cc8c3827c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetail.cs @@ -1,60 +1,61 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote; + using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote; -public class StoreProductRecycleNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreProductRecycleNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreProductRecycleNote Master { get; set; } = null!; + public virtual StoreProductRecycleNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest.cs index 6d45f1189..d0c22893e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail; -public class StoreProductRecycleRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductRecycleRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string? Shift { get; set; } + public string? Shift { get; set; } - public virtual ICollection StoreProductRecycleRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreProductRecycleRequestDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? Workshop { get; set; } + public string? Workshop { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetail.cs index 4bd84834e..635f83d55 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetail.cs @@ -1,54 +1,55 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest; -public class StoreProductRecycleRequestDetail : AuditedAggregateRoot -{ - public string? BomVersion { get; set; } + public class StoreProductRecycleRequestDetail : AuditedAggregateRoot + { + public string? BomVersion { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public virtual StoreProductRecycleRequest Master { get; set; } = null!; + public virtual StoreProductRecycleRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? RawLocationArea { get; set; } + public string? RawLocationArea { get; set; } - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public string? RawLocationErpCode { get; set; } + public string? RawLocationErpCode { get; set; } - public string? RawLocationGroup { get; set; } + public string? RawLocationGroup { get; set; } - public string? RawWarehouseCode { get; set; } + public string? RawWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlan/StoreProductionPlan.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlan/StoreProductionPlan.cs index f161fab49..56a869563 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlan/StoreProductionPlan.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlan/StoreProductionPlan.cs @@ -1,46 +1,47 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionPlan; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionPlan +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductionPlanDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductionPlanDetail; -public class StoreProductionPlan : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductionPlan : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanDate { get; set; } + public DateTime PlanDate { get; set; } - public DateTime PlanTime { get; set; } + public DateTime PlanTime { get; set; } - public string ProdLine { get; set; } = null!; + public string ProdLine { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string Shift { get; set; } = null!; + public string Shift { get; set; } = null!; - public virtual ICollection StoreProductionPlanDetails { get; set; } = - new List(); + public virtual ICollection StoreProductionPlanDetails { get; set; } = + new List(); - public string Team { get; set; } = null!; + public string Team { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } - public string Workshop { get; set; } = null!; + public string Workshop { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlanDetail/StoreProductionPlanDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlanDetail/StoreProductionPlanDetail.cs index 758e69a38..03349e8c0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlanDetail/StoreProductionPlanDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionPlanDetail/StoreProductionPlanDetail.cs @@ -1,48 +1,49 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionPlanDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionPlanDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductionPlan; + using WinIn.FasterZ.Wms.Z_Business.StoreProductionPlan; -public class StoreProductionPlanDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreProductionPlanDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? BomVersion { get; set; } + public string? BomVersion { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public decimal GoodQty { get; set; } + public decimal GoodQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public int LineStatus { get; set; } + public int LineStatus { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreProductionPlan Master { get; set; } = null!; + public virtual StoreProductionPlan Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public decimal NoGoodQty { get; set; } + public decimal NoGoodQty { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal PlanQty { get; set; } + public decimal PlanQty { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? Uom { get; set; } + public string? Uom { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNote/StoreProductionReturnNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNote/StoreProductionReturnNote.cs index e7c796fa2..9b7acd235 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNote/StoreProductionReturnNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNote/StoreProductionReturnNote.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNoteDetail; -public class StoreProductionReturnNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductionReturnNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ProductionReturnRequestNumber { get; set; } + public string? ProductionReturnRequestNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public DateTime ReturnTime { get; set; } + public DateTime ReturnTime { get; set; } - public virtual ICollection StoreProductionReturnNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreProductionReturnNoteDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNoteDetail/StoreProductionReturnNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNoteDetail/StoreProductionReturnNoteDetail.cs index 1953ea972..0a62b4b13 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNoteDetail/StoreProductionReturnNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnNoteDetail/StoreProductionReturnNoteDetail.cs @@ -1,128 +1,129 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNote; + using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnNote; -public class StoreProductionReturnNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreProductionReturnNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreProductionReturnNote Master { get; set; } = null!; + public virtual StoreProductionReturnNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequest/StoreProductionReturnRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequest/StoreProductionReturnRequest.cs index 7ed888dfa..e4ea29cf8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequest/StoreProductionReturnRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequest/StoreProductionReturnRequest.cs @@ -1,34 +1,35 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequestDetail; -public class StoreProductionReturnRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreProductionReturnRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreProductionReturnRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreProductionReturnRequestDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequestDetail/StoreProductionReturnRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequestDetail/StoreProductionReturnRequestDetail.cs index 27fdd5ba4..2e764751f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequestDetail/StoreProductionReturnRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreProductionReturnRequestDetail/StoreProductionReturnRequestDetail.cs @@ -1,76 +1,77 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreProductionReturnRequest; -public class StoreProductionReturnRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreProductionReturnRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreProductionReturnRequest Master { get; set; } = null!; + public virtual StoreProductionReturnRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrder/StorePurchaseOrder.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrder/StorePurchaseOrder.cs index f61fbc9a9..542adda41 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrder/StorePurchaseOrder.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrder/StorePurchaseOrder.cs @@ -1,48 +1,49 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail; -public class StorePurchaseOrder : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePurchaseOrder : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? ContactEmail { get; set; } + public string? ContactEmail { get; set; } - public string? ContactName { get; set; } + public string? ContactName { get; set; } - public string? ContactPhone { get; set; } + public string? ContactPhone { get; set; } - public DateTime DueDate { get; set; } + public DateTime DueDate { get; set; } - public bool? IsConsignment { get; set; } + public bool? IsConsignment { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime OrderDate { get; set; } + public DateTime OrderDate { get; set; } - public string OrderStatus { get; set; } = null!; + public string OrderStatus { get; set; } = null!; - public string? PoType { get; set; } + public string? PoType { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StorePurchaseOrderDetails { get; set; } = - new List(); + public virtual ICollection StorePurchaseOrderDetails { get; set; } = + new List(); - public string? SupplierAddress { get; set; } + public string? SupplierAddress { get; set; } - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string? SupplierName { get; set; } + public string? SupplierName { get; set; } - public decimal TaxRate { get; set; } + public decimal TaxRate { get; set; } - public string? Version { get; set; } + public string? Version { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetail.cs index 9af779bda..c3ebd97b8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetail.cs @@ -1,70 +1,71 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder; -public class StorePurchaseOrderDetail : AuditedAggregateRoot -{ - public decimal ConvertRate { get; set; } + public class StorePurchaseOrderDetail : AuditedAggregateRoot + { + public decimal ConvertRate { get; set; } - public string? Ctype { get; set; } + public string? Ctype { get; set; } - public DateTime? ExpireDate { get; set; } + public DateTime? ExpireDate { get; set; } - public bool? IsConsignment { get; set; } + public bool? IsConsignment { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string LineStatus { get; set; } = null!; + public string LineStatus { get; set; } = null!; - public string? LocationErpCode { get; set; } + public string? LocationErpCode { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StorePurchaseOrder Master { get; set; } = null!; + public virtual StorePurchaseOrder Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OrderRemark { get; set; } + public string? OrderRemark { get; set; } - public DateTime? PlanArriveDate { get; set; } + public DateTime? PlanArriveDate { get; set; } - public string? PlanUserCode { get; set; } + public string? PlanUserCode { get; set; } - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public DateTime? ProduceDate { get; set; } + public DateTime? ProduceDate { get; set; } - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public decimal PutAwayQty { get; set; } + public decimal PutAwayQty { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public decimal ReceivedQty { get; set; } + public decimal ReceivedQty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal ReturnedQty { get; set; } + public decimal ReturnedQty { get; set; } - public decimal ShippedQty { get; set; } + public decimal ShippedQty { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public decimal SupplierPackQty { get; set; } + public decimal SupplierPackQty { get; set; } - public string? SupplierPackUom { get; set; } + public string? SupplierPackUom { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote.cs index 7e4d97057..ad9df7008 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote.cs @@ -1,46 +1,47 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail; -public class StorePurchaseReceiptNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePurchaseReceiptNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public DateTime ReceiveTime { get; set; } + public DateTime ReceiveTime { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public virtual ICollection StorePurchaseReceiptNoteDetails { get; set; } = - new List(); + public virtual ICollection StorePurchaseReceiptNoteDetails { get; set; } = + new List(); - public string? SupplierAddress { get; set; } + public string? SupplierAddress { get; set; } - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? SupplierName { get; set; } + public string? SupplierName { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? WarehouseCode { get; set; } + public string? WarehouseCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetail.cs index 8161454fc..dfba4314b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetail.cs @@ -1,126 +1,127 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote; -public class StorePurchaseReceiptNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StorePurchaseReceiptNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FailedReason { get; set; } + public string? FailedReason { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string? InspectPhotoJson { get; set; } + public string? InspectPhotoJson { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public string? MassDefect { get; set; } + public string? MassDefect { get; set; } - public virtual StorePurchaseReceiptNote Master { get; set; } = null!; + public virtual StorePurchaseReceiptNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string PurchaseReceiptInspectStatus { get; set; } = null!; + public string PurchaseReceiptInspectStatus { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public decimal SupplierPackQty { get; set; } + public decimal SupplierPackQty { get; set; } - public string? SupplierPackUom { get; set; } + public string? SupplierPackUom { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest.cs index df3f67223..c645b7fa2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest.cs @@ -1,54 +1,55 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail; -public class StorePurchaseReceiptRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePurchaseReceiptRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string DockCode { get; set; } = null!; + public string DockCode { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanArriveDate { get; set; } + public DateTime PlanArriveDate { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public virtual ICollection StorePurchaseReceiptRequestDetails { get; set; } = - new List(); + public virtual ICollection StorePurchaseReceiptRequestDetails { get; set; } = + new List(); - public string? SupplierAddress { get; set; } + public string? SupplierAddress { get; set; } - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? SupplierName { get; set; } + public string? SupplierName { get; set; } - public string TimeWindow { get; set; } = null!; + public string TimeWindow { get; set; } = null!; - public string? TruckNumber { get; set; } + public string? TruckNumber { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetail.cs index 1d1c02ec5..ee5bd5193 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetail.cs @@ -1,58 +1,59 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest; -public class StorePurchaseReceiptRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StorePurchaseReceiptRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public decimal ConvertRate { get; set; } + public decimal ConvertRate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StorePurchaseReceiptRequest Master { get; set; } = null!; + public virtual StorePurchaseReceiptRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? RecommendErpCode { get; set; } + public string? RecommendErpCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public decimal SupplierPackQty { get; set; } + public decimal SupplierPackQty { get; set; } - public string? SupplierPackUom { get; set; } + public string? SupplierPackUom { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote.cs index a06262883..1ee839e07 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote.cs @@ -1,42 +1,43 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail; -public class StorePurchaseReturnNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePurchaseReturnNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? PurchaseReturnRequestNumber { get; set; } + public string? PurchaseReturnRequestNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? ReturnReason { get; set; } + public string? ReturnReason { get; set; } - public DateTime ReturnTime { get; set; } + public DateTime ReturnTime { get; set; } - public string ReturnType { get; set; } = null!; + public string ReturnType { get; set; } = null!; - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public virtual ICollection StorePurchaseReturnNoteDetails { get; set; } = - new List(); + public virtual ICollection StorePurchaseReturnNoteDetails { get; set; } = + new List(); - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetail.cs index 32b4a3aa9..b4f82b3b3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetail.cs @@ -1,116 +1,117 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote; -public class StorePurchaseReturnNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StorePurchaseReturnNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StorePurchaseReturnNote Master { get; set; } = null!; + public virtual StorePurchaseReturnNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest.cs index 887d6e8b6..4e7d78b63 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest.cs @@ -1,46 +1,47 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail; -public class StorePurchaseReturnRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePurchaseReturnRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public DateTime ReturnTime { get; set; } + public DateTime ReturnTime { get; set; } - public string ReturnType { get; set; } = null!; + public string ReturnType { get; set; } = null!; - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public virtual ICollection StorePurchaseReturnRequestDetails { get; set; } = - new List(); + public virtual ICollection StorePurchaseReturnRequestDetails { get; set; } = + new List(); - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetail.cs index 3e084c5e9..66f0b1750 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetail.cs @@ -1,62 +1,63 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest; + using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest; -public class StorePurchaseReturnRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StorePurchaseReturnRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StorePurchaseReturnRequest Master { get; set; } = null!; + public virtual StorePurchaseReturnRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNote/StorePutawayNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNote/StorePutawayNote.cs index cfd7553e0..8a97f9b86 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNote/StorePutawayNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNote/StorePutawayNote.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail; -public class StorePutawayNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePutawayNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public string? InspectNumber { get; set; } + public string? InspectNumber { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? ProductReceiptNumber { get; set; } + public string? ProductReceiptNumber { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public string? ReceiptNumber { get; set; } + public string? ReceiptNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public virtual ICollection StorePutawayNoteDetails { get; set; } = - new List(); + public virtual ICollection StorePutawayNoteDetails { get; set; } = + new List(); - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetail.cs index c0426a040..241f60c02 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetail.cs @@ -1,134 +1,135 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePutawayNote; + using WinIn.FasterZ.Wms.Z_Business.StorePutawayNote; -public class StorePutawayNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StorePutawayNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public virtual StorePutawayNote Master { get; set; } = null!; + public virtual StorePutawayNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequest/StorePutawayRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequest/StorePutawayRequest.cs index d11d807c1..4b517c46e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequest/StorePutawayRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequest/StorePutawayRequest.cs @@ -1,56 +1,57 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail; -public class StorePutawayRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StorePutawayRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? AsnNumber { get; set; } + public string? AsnNumber { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string? InspectNumber { get; set; } + public string? InspectNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? ProductReceiptNumber { get; set; } + public string? ProductReceiptNumber { get; set; } - public string? PurchaseReceiptRequestNumber { get; set; } + public string? PurchaseReceiptRequestNumber { get; set; } - public string PutawayMode { get; set; } = null!; + public string PutawayMode { get; set; } = null!; - public string? ReceiptNumber { get; set; } + public string? ReceiptNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public string? RpNumber { get; set; } + public string? RpNumber { get; set; } - public virtual ICollection StorePutawayRequestDetails { get; set; } = - new List(); + public virtual ICollection StorePutawayRequestDetails { get; set; } = + new List(); - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetail.cs index a5ce0a74e..48519e990 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetail.cs @@ -1,82 +1,83 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest; + using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest; -public class StorePutawayRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StorePutawayRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public decimal InventoryQty { get; set; } + public decimal InventoryQty { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StorePutawayRequest Master { get; set; } = null!; + public virtual StorePutawayRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote.cs index 2ec492007..7ce14d0b9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail; -public class StoreReceiptAbnormalNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreReceiptAbnormalNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string AsnNumber { get; set; } = null!; + public string AsnNumber { get; set; } = null!; - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string ReceiptNumber { get; set; } = null!; + public string ReceiptNumber { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreReceiptAbnormalNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreReceiptAbnormalNoteDetails { get; set; } = + new List(); - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetail.cs index 9c6d2d5cf..650e2611e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetail.cs @@ -1,64 +1,65 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote; + using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote; -public class StoreReceiptAbnormalNoteDetail : AuditedAggregateRoot -{ - public string AbnormalType { get; set; } = null!; + public class StoreReceiptAbnormalNoteDetail : AuditedAggregateRoot + { + public string AbnormalType { get; set; } = null!; - public DateTime ArriveDate { get; set; } + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreReceiptAbnormalNote Master { get; set; } = null!; + public virtual StoreReceiptAbnormalNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? Photos { get; set; } + public string? Photos { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string ReceiptNumber { get; set; } = null!; + public string ReceiptNumber { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote.cs index db207a482..8018ed9ae 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote.cs @@ -1,25 +1,26 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail; -public class StoreRecycledMaterialReceiptNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreRecycledMaterialReceiptNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreRecycledMaterialReceiptNoteDetails - { - get; - set; - } = new List(); + public virtual ICollection StoreRecycledMaterialReceiptNoteDetails + { + get; + set; + } = new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetail.cs index fc3a0b437..7bf2f491a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetail.cs @@ -1,60 +1,61 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote; + using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote; -public class StoreRecycledMaterialReceiptNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreRecycledMaterialReceiptNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreRecycledMaterialReceiptNote Master { get; set; } = null!; + public virtual StoreRecycledMaterialReceiptNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrder/StoreSaleOrder.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrder/StoreSaleOrder.cs index bfa63a8bc..dac565a7f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrder/StoreSaleOrder.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrder/StoreSaleOrder.cs @@ -1,42 +1,43 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail; -public class StoreSaleOrder : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreSaleOrder : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? ContactEmail { get; set; } + public string? ContactEmail { get; set; } - public string? ContactName { get; set; } + public string? ContactName { get; set; } - public string? ContactPhone { get; set; } + public string? ContactPhone { get; set; } - public string? CustomerCode { get; set; } + public string? CustomerCode { get; set; } - public DateTime DueDate { get; set; } + public DateTime DueDate { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime OrderDate { get; set; } + public DateTime OrderDate { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string SoStatus { get; set; } = null!; + public string SoStatus { get; set; } = null!; - public string? SoType { get; set; } + public string? SoType { get; set; } - public virtual ICollection StoreSaleOrderDetails { get; set; } = - new List(); + public virtual ICollection StoreSaleOrderDetails { get; set; } = + new List(); - public decimal TaxRate { get; set; } + public decimal TaxRate { get; set; } - public string? Version { get; set; } + public string? Version { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetail.cs index 39349c8ad..8450fe45e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetail.cs @@ -1,42 +1,43 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder; + using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder; -public class StoreSaleOrderDetail : AuditedAggregateRoot -{ - public decimal ConvertRate { get; set; } + public class StoreSaleOrderDetail : AuditedAggregateRoot + { + public decimal ConvertRate { get; set; } - public decimal CustomerPackQty { get; set; } + public decimal CustomerPackQty { get; set; } - public string? CustomerPackUom { get; set; } + public string? CustomerPackUom { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string LineStatus { get; set; } = null!; + public string LineStatus { get; set; } = null!; - public virtual StoreSaleOrder Master { get; set; } = null!; + public virtual StoreSaleOrder Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string SoLine { get; set; } = null!; + public string SoLine { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNote/StoreScrapNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNote/StoreScrapNote.cs index a88e7fe6d..047345bcb 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNote/StoreScrapNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNote/StoreScrapNote.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; -public class StoreScrapNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreScrapNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? ScrapRequestNumber { get; set; } + public string? ScrapRequestNumber { get; set; } - public virtual ICollection StoreScrapNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreScrapNoteDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail.cs index f27cfa7a7..16689d0f4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail.cs @@ -1,78 +1,79 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreScrapNote; + using WinIn.FasterZ.Wms.Z_Business.StoreScrapNote; -public class StoreScrapNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreScrapNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreScrapNote Master { get; set; } = null!; + public virtual StoreScrapNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequest/StoreScrapRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequest/StoreScrapRequest.cs index f73957e52..bbef01bb4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequest/StoreScrapRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequest/StoreScrapRequest.cs @@ -1,36 +1,37 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail; -public class StoreScrapRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreScrapRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreScrapRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreScrapRequestDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetail.cs index 2d79923e1..16da891b0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetail.cs @@ -1,44 +1,45 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest; -public class StoreScrapRequestDetail : AuditedAggregateRoot -{ - public string ItemCode { get; set; } = null!; + public class StoreScrapRequestDetail : AuditedAggregateRoot + { + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public virtual StoreScrapRequest Master { get; set; } = null!; + public virtual StoreScrapRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsn/StoreSupplierAsn.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsn/StoreSupplierAsn.cs index 4e5515726..6662d983b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsn/StoreSupplierAsn.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsn/StoreSupplierAsn.cs @@ -1,58 +1,59 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail; -public class StoreSupplierAsn : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreSupplierAsn : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? ContactEmail { get; set; } + public string? ContactEmail { get; set; } - public string? ContactName { get; set; } + public string? ContactName { get; set; } - public string? ContactPhone { get; set; } + public string? ContactPhone { get; set; } - public string CreateType { get; set; } = null!; + public string CreateType { get; set; } = null!; - public string? Ctype { get; set; } + public string? Ctype { get; set; } - public string DockCode { get; set; } = null!; + public string DockCode { get; set; } = null!; - public DateTime DueDate { get; set; } + public DateTime DueDate { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime PlanArriveDate { get; set; } + public DateTime PlanArriveDate { get; set; } - public string? PlanUserCode { get; set; } + public string? PlanUserCode { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RpNumber { get; set; } = null!; + public string RpNumber { get; set; } = null!; - public DateTime ShipDate { get; set; } + public DateTime ShipDate { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public virtual ICollection StoreSupplierAsnDetails { get; set; } = - new List(); + public virtual ICollection StoreSupplierAsnDetails { get; set; } = + new List(); - public string? SupplierAddress { get; set; } + public string? SupplierAddress { get; set; } - public string SupplierCode { get; set; } = null!; + public string SupplierCode { get; set; } = null!; - public string? SupplierName { get; set; } + public string? SupplierName { get; set; } - public string? TimeWindow { get; set; } + public string? TimeWindow { get; set; } - public string? TruckNumber { get; set; } + public string? TruckNumber { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetail.cs index 6b765b2f1..8194f2974 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetail.cs @@ -1,64 +1,65 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn; + using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn; -public class StoreSupplierAsnDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreSupplierAsnDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public decimal ConvertRate { get; set; } + public decimal ConvertRate { get; set; } - public string? Ctype { get; set; } + public string? Ctype { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreSupplierAsn Master { get; set; } = null!; + public virtual StoreSupplierAsn Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public string? PlanUserCode { get; set; } + public string? PlanUserCode { get; set; } - public string? PoLine { get; set; } + public string? PoLine { get; set; } - public string? PoNumber { get; set; } + public string? PoNumber { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProjectCode { get; set; } + public string? ProjectCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? RecommendErpCode { get; set; } + public string? RecommendErpCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public decimal SupplierPackQty { get; set; } + public decimal SupplierPackQty { get; set; } - public string? SupplierPackUom { get; set; } + public string? SupplierPackUom { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs index 301445d80..e0cde1fc7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; + using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; -public class StoreTransferNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreTransferNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool Confirmed { get; set; } + public bool Confirmed { get; set; } - public DateTime? ConfirmTime { get; set; } + public DateTime? ConfirmTime { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public virtual ICollection StoreTransferNoteDetailCopies { get; set; } = - new List(); + public virtual ICollection StoreTransferNoteDetailCopies { get; set; } = + new List(); - public virtual ICollection StoreTransferNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreTransferNoteDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public bool UseOnTheWayLocation { get; set; } + public bool UseOnTheWayLocation { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs index 2e353c41b..5f9fbe2db 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs @@ -1,28 +1,29 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -public class StoreTransferNoteCopy : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreTransferNoteCopy : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool Confirmed { get; set; } + public bool Confirmed { get; set; } - public DateTime? ConfirmTime { get; set; } + public DateTime? ConfirmTime { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public string? Type { get; set; } + public string? Type { get; set; } - public bool UseOnTheWayLocation { get; set; } + public bool UseOnTheWayLocation { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetail.cs index c351ee485..a60b5ac88 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetail.cs @@ -1,80 +1,81 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; + using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; -public class StoreTransferNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreTransferNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreTransferNote Master { get; set; } = null!; + public virtual StoreTransferNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnTheWayLocationCode { get; set; } + public string? OnTheWayLocationCode { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs index f64b0e55a..8c72f7466 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs @@ -1,80 +1,81 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; + using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; -public class StoreTransferNoteDetailCopy : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreTransferNoteDetailCopy : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreTransferNote Master { get; set; } = null!; + public virtual StoreTransferNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnTheWayLocationCode { get; set; } + public string? OnTheWayLocationCode { get; set; } - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequest/StoreTransferRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequest/StoreTransferRequest.cs index 14f0e2c74..a32f2941d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequest/StoreTransferRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequest/StoreTransferRequest.cs @@ -1,38 +1,39 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail; -public class StoreTransferRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreTransferRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreTransferRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreTransferRequestDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public bool UseOnTheWayLocation { get; set; } + public bool UseOnTheWayLocation { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetail.cs index 3c637d8ee..61c7f7897 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetail.cs @@ -1,78 +1,79 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest; -public class StoreTransferRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreTransferRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreTransferRequest Master { get; set; } = null!; + public virtual StoreTransferRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote.cs index 8e5fcc314..78e1473e0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote.cs @@ -1,32 +1,33 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail; -public class StoreUnplannedIssueNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreUnplannedIssueNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime BuildDate { get; set; } + public DateTime BuildDate { get; set; } - public string? DeptCode { get; set; } + public string? DeptCode { get; set; } - public string? DeptName { get; set; } + public string? DeptName { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreUnplannedIssueNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreUnplannedIssueNoteDetails { get; set; } = + new List(); - public string? UnplannedIssueRequestNumber { get; set; } + public string? UnplannedIssueRequestNumber { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetail.cs index 18dd43ad8..818fb30e0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetail.cs @@ -1,118 +1,119 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote; -public class StoreUnplannedIssueNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreUnplannedIssueNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? CaseCode { get; set; } + public string? CaseCode { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledFromLocationArea { get; set; } + public string? HandledFromLocationArea { get; set; } - public string? HandledFromLocationCode { get; set; } + public string? HandledFromLocationCode { get; set; } - public string? HandledFromLocationErpCode { get; set; } + public string? HandledFromLocationErpCode { get; set; } - public string? HandledFromLocationGroup { get; set; } + public string? HandledFromLocationGroup { get; set; } - public string? HandledFromWarehouseCode { get; set; } + public string? HandledFromWarehouseCode { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreUnplannedIssueNote Master { get; set; } = null!; + public virtual StoreUnplannedIssueNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnceBusiCode { get; set; } + public string? OnceBusiCode { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProjCapacityCode { get; set; } + public string? ProjCapacityCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendFromLocationArea { get; set; } + public string? RecommendFromLocationArea { get; set; } - public string? RecommendFromLocationCode { get; set; } + public string? RecommendFromLocationCode { get; set; } - public string? RecommendFromLocationErpCode { get; set; } + public string? RecommendFromLocationErpCode { get; set; } - public string? RecommendFromLocationGroup { get; set; } + public string? RecommendFromLocationGroup { get; set; } - public string? RecommendFromWarehouseCode { get; set; } + public string? RecommendFromWarehouseCode { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest.cs index 9d83d3901..3f973e1e4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail; -public class StoreUnplannedIssueRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreUnplannedIssueRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public DateTime BuildDate { get; set; } + public DateTime BuildDate { get; set; } - public string? DeptCode { get; set; } + public string? DeptCode { get; set; } - public string? DeptName { get; set; } + public string? DeptName { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreUnplannedIssueRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreUnplannedIssueRequestDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetail.cs index 34610fbd3..d9cba1809 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetail.cs @@ -1,66 +1,67 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest; -public class StoreUnplannedIssueRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreUnplannedIssueRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? CaseCode { get; set; } + public string? CaseCode { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreUnplannedIssueRequest Master { get; set; } = null!; + public virtual StoreUnplannedIssueRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnceBusiCode { get; set; } + public string? OnceBusiCode { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProjCapacityCode { get; set; } + public string? ProjCapacityCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote.cs index 6ff80a219..7a383fe12 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote.cs @@ -1,32 +1,33 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail; -public class StoreUnplannedReceiptNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreUnplannedReceiptNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime BuildDate { get; set; } + public DateTime BuildDate { get; set; } - public string? DeptCode { get; set; } + public string? DeptCode { get; set; } - public string? DeptName { get; set; } + public string? DeptName { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreUnplannedReceiptNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreUnplannedReceiptNoteDetails { get; set; } = + new List(); - public string? UnplannedReceiptRequestNumber { get; set; } + public string? UnplannedReceiptRequestNumber { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetail.cs index b3f4f61fa..85a908b89 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetail.cs @@ -1,118 +1,119 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote; -public class StoreUnplannedReceiptNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreUnplannedReceiptNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? CaseCode { get; set; } + public string? CaseCode { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public DateTime HandledArriveDate { get; set; } + public DateTime HandledArriveDate { get; set; } - public string? HandledContainerCode { get; set; } + public string? HandledContainerCode { get; set; } - public DateTime HandledExpireDate { get; set; } + public DateTime HandledExpireDate { get; set; } - public string? HandledLot { get; set; } + public string? HandledLot { get; set; } - public string? HandledPackingCode { get; set; } + public string? HandledPackingCode { get; set; } - public DateTime HandledProduceDate { get; set; } + public DateTime HandledProduceDate { get; set; } - public decimal HandledQty { get; set; } + public decimal HandledQty { get; set; } - public string? HandledSupplierBatch { get; set; } + public string? HandledSupplierBatch { get; set; } - public string? HandledToLocationArea { get; set; } + public string? HandledToLocationArea { get; set; } - public string? HandledToLocationCode { get; set; } + public string? HandledToLocationCode { get; set; } - public string? HandledToLocationErpCode { get; set; } + public string? HandledToLocationErpCode { get; set; } - public string? HandledToLocationGroup { get; set; } + public string? HandledToLocationGroup { get; set; } - public string? HandledToWarehouseCode { get; set; } + public string? HandledToWarehouseCode { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreUnplannedReceiptNote Master { get; set; } = null!; + public virtual StoreUnplannedReceiptNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnceBusiCode { get; set; } + public string? OnceBusiCode { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProjCapacityCode { get; set; } + public string? ProjCapacityCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public DateTime RecommendArriveDate { get; set; } + public DateTime RecommendArriveDate { get; set; } - public string? RecommendContainerCode { get; set; } + public string? RecommendContainerCode { get; set; } - public DateTime RecommendExpireDate { get; set; } + public DateTime RecommendExpireDate { get; set; } - public string? RecommendLot { get; set; } + public string? RecommendLot { get; set; } - public string? RecommendPackingCode { get; set; } + public string? RecommendPackingCode { get; set; } - public DateTime RecommendProduceDate { get; set; } + public DateTime RecommendProduceDate { get; set; } - public decimal RecommendQty { get; set; } + public decimal RecommendQty { get; set; } - public string? RecommendSupplierBatch { get; set; } + public string? RecommendSupplierBatch { get; set; } - public string? RecommendToLocationArea { get; set; } + public string? RecommendToLocationArea { get; set; } - public string? RecommendToLocationCode { get; set; } + public string? RecommendToLocationCode { get; set; } - public string? RecommendToLocationErpCode { get; set; } + public string? RecommendToLocationErpCode { get; set; } - public string? RecommendToLocationGroup { get; set; } + public string? RecommendToLocationGroup { get; set; } - public string? RecommendToWarehouseCode { get; set; } + public string? RecommendToWarehouseCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest.cs index 8930a7514..740b11ec0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest.cs @@ -1,40 +1,41 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail; -public class StoreUnplannedReceiptRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreUnplannedReceiptRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public DateTime BuildDate { get; set; } + public DateTime BuildDate { get; set; } - public string? DeptCode { get; set; } + public string? DeptCode { get; set; } - public string? DeptName { get; set; } + public string? DeptName { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreUnplannedReceiptRequestDetails { get; set; } = - new List(); + public virtual ICollection StoreUnplannedReceiptRequestDetails { get; set; } = + new List(); - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetail.cs index 2002e5454..e26d3e513 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetail.cs @@ -1,66 +1,67 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest; -public class StoreUnplannedReceiptRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreUnplannedReceiptRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public string? CaseCode { get; set; } + public string? CaseCode { get; set; } - public string? ContainerCode { get; set; } + public string? ContainerCode { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationArea { get; set; } + public string? LocationArea { get; set; } - public string LocationCode { get; set; } = null!; + public string LocationCode { get; set; } = null!; - public string LocationErpCode { get; set; } = null!; + public string LocationErpCode { get; set; } = null!; - public string? LocationGroup { get; set; } + public string? LocationGroup { get; set; } - public string? Lot { get; set; } + public string? Lot { get; set; } - public virtual StoreUnplannedReceiptRequest Master { get; set; } = null!; + public virtual StoreUnplannedReceiptRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? OnceBusiCode { get; set; } + public string? OnceBusiCode { get; set; } - public string PackingCode { get; set; } = null!; + public string PackingCode { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public string? ProjCapacityCode { get; set; } + public string? ProjCapacityCode { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public string Status { get; set; } = null!; + public string Status { get; set; } = null!; - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string WarehouseCode { get; set; } = null!; + public string WarehouseCode { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote.cs index 6fee6c27d..8118de472 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote.cs @@ -1,26 +1,27 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail; -public class StoreWarehouseTransferNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreWarehouseTransferNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreWarehouseTransferNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreWarehouseTransferNoteDetails { get; set; } = + new List(); - public string? SupplierCode { get; set; } + public string? SupplierCode { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetail.cs index 12f302536..3bca3da25 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetail.cs @@ -1,78 +1,79 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote; + using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote; -public class StoreWarehouseTransferNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreWarehouseTransferNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreWarehouseTransferNote Master { get; set; } = null!; + public virtual StoreWarehouseTransferNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote.cs index c24aecf6e..eb2bf9762 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote.cs @@ -1,32 +1,33 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail; -public class StoreWipWarehouseAdjustNote : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreWipWarehouseAdjustNote : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool Confirmed { get; set; } + public bool Confirmed { get; set; } - public DateTime? ConfirmTime { get; set; } + public DateTime? ConfirmTime { get; set; } - public string? JobNumber { get; set; } + public string? JobNumber { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string? RequestNumber { get; set; } + public string? RequestNumber { get; set; } - public virtual ICollection StoreWipWarehouseAdjustNoteDetails { get; set; } = - new List(); + public virtual ICollection StoreWipWarehouseAdjustNoteDetails { get; set; } = + new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetail.cs index faacf36c6..7abba5ce6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetail.cs @@ -1,80 +1,81 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote; + using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote; -public class StoreWipWarehouseAdjustNoteDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreWipWarehouseAdjustNoteDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreWipWarehouseAdjustNote Master { get; set; } = null!; + public virtual StoreWipWarehouseAdjustNote Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest.cs index 536e07598..0d8272adc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest.cs @@ -1,35 +1,36 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail; -public class StoreWipWarehouseAdjustRequest : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreWipWarehouseAdjustRequest : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public bool AutoAgree { get; set; } + public bool AutoAgree { get; set; } - public bool AutoCompleteJob { get; set; } + public bool AutoCompleteJob { get; set; } - public bool AutoHandle { get; set; } + public bool AutoHandle { get; set; } - public bool AutoSubmit { get; set; } + public bool AutoSubmit { get; set; } - public bool DirectCreateNote { get; set; } + public bool DirectCreateNote { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Remark { get; set; } + public string? Remark { get; set; } - public string RequestStatus { get; set; } = null!; + public string RequestStatus { get; set; } = null!; - public virtual ICollection StoreWipWarehouseAdjustRequestDetails { get; set; } = new List(); + public virtual ICollection StoreWipWarehouseAdjustRequestDetails { get; set; } = new List(); - public string? Type { get; set; } + public string? Type { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetail.cs index 21366461c..8553fb9ac 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetail.cs @@ -1,80 +1,81 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest; + using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest; -public class StoreWipWarehouseAdjustRequestDetail : AuditedAggregateRoot -{ - public DateTime ArriveDate { get; set; } + public class StoreWipWarehouseAdjustRequestDetail : AuditedAggregateRoot + { + public DateTime ArriveDate { get; set; } - public DateTime ExpireDate { get; set; } + public DateTime ExpireDate { get; set; } - public string? FromContainerCode { get; set; } + public string? FromContainerCode { get; set; } - public string? FromLocationArea { get; set; } + public string? FromLocationArea { get; set; } - public string FromLocationCode { get; set; } = null!; + public string FromLocationCode { get; set; } = null!; - public string FromLocationErpCode { get; set; } = null!; + public string FromLocationErpCode { get; set; } = null!; - public string? FromLocationGroup { get; set; } + public string? FromLocationGroup { get; set; } - public string? FromLot { get; set; } + public string? FromLot { get; set; } - public string? FromPackingCode { get; set; } + public string? FromPackingCode { get; set; } - public string FromStatus { get; set; } = null!; + public string FromStatus { get; set; } = null!; - public string FromWarehouseCode { get; set; } = null!; + public string FromWarehouseCode { get; set; } = null!; - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreWipWarehouseAdjustRequest Master { get; set; } = null!; + public virtual StoreWipWarehouseAdjustRequest Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public DateTime ProduceDate { get; set; } + public DateTime ProduceDate { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Reason { get; set; } + public string? Reason { get; set; } - public string? ReasonCode { get; set; } + public string? ReasonCode { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public decimal StdPackQty { get; set; } + public decimal StdPackQty { get; set; } - public string? SupplierBatch { get; set; } + public string? SupplierBatch { get; set; } - public string? ToContainerCode { get; set; } + public string? ToContainerCode { get; set; } - public string? ToLocationArea { get; set; } + public string? ToLocationArea { get; set; } - public string ToLocationCode { get; set; } = null!; + public string ToLocationCode { get; set; } = null!; - public string ToLocationErpCode { get; set; } = null!; + public string ToLocationErpCode { get; set; } = null!; - public string? ToLocationGroup { get; set; } + public string? ToLocationGroup { get; set; } - public string? ToLot { get; set; } + public string? ToLot { get; set; } - public string? ToPackingCode { get; set; } + public string? ToPackingCode { get; set; } - public string ToStatus { get; set; } = null!; + public string ToStatus { get; set; } = null!; - public string ToWarehouseCode { get; set; } = null!; + public string ToWarehouseCode { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrder/StoreWorkOrder.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrder/StoreWorkOrder.cs index 8868541ef..f0de68388 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrder/StoreWorkOrder.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrder/StoreWorkOrder.cs @@ -1,48 +1,49 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder; - -using System; -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder +{ + using System; + using System.Collections.Generic; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail; + using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail; -public class StoreWorkOrder : AuditedAggregateRoot -{ - public DateTime ActiveDate { get; set; } + public class StoreWorkOrder : AuditedAggregateRoot + { + public DateTime ActiveDate { get; set; } - public DateTime EffectiveDate { get; set; } + public DateTime EffectiveDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public string? LocationCode { get; set; } + public string? LocationCode { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Op { get; set; } + public string? Op { get; set; } - public decimal Qty { get; set; } + public decimal Qty { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } - public virtual ICollection StoreWorkOrderDetails { get; set; } = - new List(); + public virtual ICollection StoreWorkOrderDetails { get; set; } = + new List(); - public string Type { get; set; } = null!; + public string Type { get; set; } = null!; - public string Uom { get; set; } = null!; + public string Uom { get; set; } = null!; - public string? Worker { get; set; } + public string? Worker { get; set; } - public string? WorkOrderId { get; set; } + public string? WorkOrderId { get; set; } - public string? WorkStation { get; set; } + public string? WorkStation { get; set; } - public string WoStatus { get; set; } = null!; + public string WoStatus { get; set; } = null!; + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs index d78bf7293..bebaae78b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs @@ -1,36 +1,37 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail; - -using System; +namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail +{ + using System; -using Volo.Abp.Domain.Entities.Auditing; + using Volo.Abp.Domain.Entities.Auditing; -using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder; + using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder; -public class StoreWorkOrderDetail : AuditedAggregateRoot -{ - public DateTime EffectiveDate { get; set; } + public class StoreWorkOrderDetail : AuditedAggregateRoot + { + public DateTime EffectiveDate { get; set; } - public string ItemCode { get; set; } = null!; + public string ItemCode { get; set; } = null!; - public string? ItemDesc1 { get; set; } + public string? ItemDesc1 { get; set; } - public string? ItemDesc2 { get; set; } + public string? ItemDesc2 { get; set; } - public string? ItemName { get; set; } + public string? ItemName { get; set; } - public virtual StoreWorkOrder Master { get; set; } = null!; + public virtual StoreWorkOrder Master { get; set; } = null!; - public Guid MasterId { get; set; } + public Guid MasterId { get; set; } - public string Number { get; set; } = null!; + public string Number { get; set; } = null!; - public string? Op { get; set; } + public string? Op { get; set; } - public string? RawLocationCode { get; set; } + public string? RawLocationCode { get; set; } - public decimal RawQty { get; set; } + public decimal RawQty { get; set; } - public string? RawUom { get; set; } + public string? RawUom { get; set; } - public string? Remark { get; set; } + public string? Remark { get; set; } + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreWmsDbSchemaMigrator.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreWmsDbSchemaMigrator.cs index 406512380..efd063924 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreWmsDbSchemaMigrator.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreWmsDbSchemaMigrator.cs @@ -5,30 +5,31 @@ using Microsoft.Extensions.DependencyInjection; using WinIn.FasterZ.Wms.Data; using Volo.Abp.DependencyInjection; -namespace WinIn.FasterZ.Wms.EntityFrameworkCore; - -public class EntityFrameworkCoreWmsDbSchemaMigrator - : IWmsDbSchemaMigrator, ITransientDependency +namespace WinIn.FasterZ.Wms.EntityFrameworkCore { - private readonly IServiceProvider _serviceProvider; - - public EntityFrameworkCoreWmsDbSchemaMigrator( - IServiceProvider serviceProvider) + public class EntityFrameworkCoreWmsDbSchemaMigrator + : IWmsDbSchemaMigrator, ITransientDependency { - _serviceProvider = serviceProvider; - } + private readonly IServiceProvider _serviceProvider; - public async Task MigrateAsync() - { - /* We intentionally resolving the WmsDbContext - * from IServiceProvider (instead of directly injecting it) - * to properly get the connection string of the current tenant in the - * current scope. - */ + public EntityFrameworkCoreWmsDbSchemaMigrator( + IServiceProvider serviceProvider) + { + _serviceProvider = serviceProvider; + } + + public async Task MigrateAsync() + { + /* We intentionally resolving the WmsDbContext + * from IServiceProvider (instead of directly injecting it) + * to properly get the connection string of the current tenant in the + * current scope. + */ - await _serviceProvider - .GetRequiredService() - .Database - .MigrateAsync(); + await _serviceProvider + .GetRequiredService() + .Database + .MigrateAsync(); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs index 2510b8d60..7735e4427 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs @@ -15,85 +15,86 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore; using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; using Volo.Abp.EntityFrameworkCore.Modeling; -namespace WinIn.FasterZ.Wms.EntityFrameworkCore; - -[ReplaceDbContext(typeof(IIdentityDbContext))] -[ReplaceDbContext(typeof(ITenantManagementDbContext))] -[ConnectionStringName("Wms")] -public class WmsDbContext : - AbpDbContext, - IIdentityDbContext, - ITenantManagementDbContext +namespace WinIn.FasterZ.Wms.EntityFrameworkCore { - /* Add DbSet properties for your Aggregate Roots / Entities here. */ - - #region Entities from the modules - - /* Notice: We only implemented IIdentityDbContext and ITenantManagementDbContext - * and replaced them for this DbContext. This allows you to perform JOIN - * queries for the entities of these modules over the repositories easily. You - * typically don't need that for other modules. But, if you need, you can - * implement the DbContext interface of the needed module and use ReplaceDbContext - * attribute just like IIdentityDbContext and ITenantManagementDbContext. - * - * More info: Replacing a DbContext of a module ensures that the related module - * uses this DbContext on runtime. Otherwise, it will use its own DbContext class. - */ - - //Identity - public DbSet Users { get; set; } - public DbSet Roles { get; set; } - public DbSet ClaimTypes { get; set; } - public DbSet OrganizationUnits { get; set; } - public DbSet SecurityLogs { get; set; } - public DbSet LinkUsers { get; set; } - public DbSet UserDelegations { get; set; } - - // Tenant Management - public DbSet Tenants { get; set; } - public DbSet TenantConnectionStrings { get; set; } - - #endregion - public DbSet AuthDepartments { get; set; } - - public WmsDbContext(DbContextOptions options) - : base(options) + [ReplaceDbContext(typeof(IIdentityDbContext))] + [ReplaceDbContext(typeof(ITenantManagementDbContext))] + [ConnectionStringName("Wms")] + public class WmsDbContext : + AbpDbContext, + IIdentityDbContext, + ITenantManagementDbContext { + /* Add DbSet properties for your Aggregate Roots / Entities here. */ + + #region Entities from the modules + + /* Notice: We only implemented IIdentityDbContext and ITenantManagementDbContext + * and replaced them for this DbContext. This allows you to perform JOIN + * queries for the entities of these modules over the repositories easily. You + * typically don't need that for other modules. But, if you need, you can + * implement the DbContext interface of the needed module and use ReplaceDbContext + * attribute just like IIdentityDbContext and ITenantManagementDbContext. + * + * More info: Replacing a DbContext of a module ensures that the related module + * uses this DbContext on runtime. Otherwise, it will use its own DbContext class. + */ + + //Identity + public DbSet Users { get; set; } + public DbSet Roles { get; set; } + public DbSet ClaimTypes { get; set; } + public DbSet OrganizationUnits { get; set; } + public DbSet SecurityLogs { get; set; } + public DbSet LinkUsers { get; set; } + public DbSet UserDelegations { get; set; } + + // Tenant Management + public DbSet Tenants { get; set; } + public DbSet TenantConnectionStrings { get; set; } + + #endregion + public DbSet AuthDepartments { get; set; } + + public WmsDbContext(DbContextOptions options) + : base(options) + { - } + } - protected override void OnModelCreating(ModelBuilder builder) - { - base.OnModelCreating(builder); + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); - /* Include modules to your migration db context */ + /* Include modules to your migration db context */ - builder.ConfigurePermissionManagement(); - builder.ConfigureSettingManagement(); - builder.ConfigureBackgroundJobs(); - builder.ConfigureAuditLogging(); - builder.ConfigureIdentity(); - builder.ConfigureOpenIddict(); - builder.ConfigureFeatureManagement(); - builder.ConfigureTenantManagement(); + builder.ConfigurePermissionManagement(); + builder.ConfigureSettingManagement(); + builder.ConfigureBackgroundJobs(); + builder.ConfigureAuditLogging(); + builder.ConfigureIdentity(); + builder.ConfigureOpenIddict(); + builder.ConfigureFeatureManagement(); + builder.ConfigureTenantManagement(); - /* Configure your own tables/entities inside here */ + /* Configure your own tables/entities inside here */ - //builder.Entity(b => - //{ - // b.ToTable(WmsConsts.DbTablePrefix + "YourEntities", WmsConsts.DbSchema); - // b.ConfigureByConvention(); //auto configure for the base class props - // //... - //}); + //builder.Entity(b => + //{ + // b.ToTable(WmsConsts.DbTablePrefix + "YourEntities", WmsConsts.DbSchema); + // b.ConfigureByConvention(); //auto configure for the base class props + // //... + //}); - builder.Entity(b => - { - b.ToTable(WmsConsts.DbTablePrefix + "Auth_Department", WmsConsts.DbSchema); - b.ConfigureByConvention(); + builder.Entity(b => + { + b.ToTable(WmsConsts.DbTablePrefix + "Auth_Department", WmsConsts.DbSchema); + b.ConfigureByConvention(); - /* Configure more properties here */ - }); + /* Configure more properties here */ + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContextFactory.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContextFactory.cs index 0a117a449..fd4723117 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContextFactory.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContextFactory.cs @@ -4,30 +4,31 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; using Microsoft.Extensions.Configuration; -namespace WinIn.FasterZ.Wms.EntityFrameworkCore; - -/* This class is needed for EF Core console commands - * (like Add-Migration and Update-Database commands) */ -public class WmsDbContextFactory : IDesignTimeDbContextFactory +namespace WinIn.FasterZ.Wms.EntityFrameworkCore { - public WmsDbContext CreateDbContext(string[] args) + /* This class is needed for EF Core console commands + * (like Add-Migration and Update-Database commands) */ + public class WmsDbContextFactory : IDesignTimeDbContextFactory { - WmsEfCoreEntityExtensionMappings.Configure(); + public WmsDbContext CreateDbContext(string[] args) + { + WmsEfCoreEntityExtensionMappings.Configure(); - var configuration = BuildConfiguration(); + var configuration = BuildConfiguration(); - var builder = new DbContextOptionsBuilder() - .UseSqlServer(configuration.GetConnectionString("Default")); + var builder = new DbContextOptionsBuilder() + .UseSqlServer(configuration.GetConnectionString("Default")); - return new WmsDbContext(builder.Options); - } + return new WmsDbContext(builder.Options); + } - private static IConfigurationRoot BuildConfiguration() - { - var builder = new ConfigurationBuilder() - .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../WinIn.FasterZ.Wms.DbMigrator/")) - .AddJsonFile("appsettings.json", optional: false); + private static IConfigurationRoot BuildConfiguration() + { + var builder = new ConfigurationBuilder() + .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../WinIn.FasterZ.Wms.DbMigrator/")) + .AddJsonFile("appsettings.json", optional: false); - return builder.Build(); + return builder.Build(); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEfCoreEntityExtensionMappings.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEfCoreEntityExtensionMappings.cs index f13a81bda..33125acef 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEfCoreEntityExtensionMappings.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEfCoreEntityExtensionMappings.cs @@ -3,19 +3,19 @@ using Volo.Abp.Identity; using Volo.Abp.ObjectExtending; using Volo.Abp.Threading; -namespace WinIn.FasterZ.Wms.EntityFrameworkCore; - -public static class WmsEfCoreEntityExtensionMappings +namespace WinIn.FasterZ.Wms.EntityFrameworkCore { - private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); - - public static void Configure() + public static class WmsEfCoreEntityExtensionMappings { - WmsGlobalFeatureConfigurator.Configure(); - WmsModuleExtensionConfigurator.Configure(); + private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); - OneTimeRunner.Run(() => + public static void Configure() { + WmsGlobalFeatureConfigurator.Configure(); + WmsModuleExtensionConfigurator.Configure(); + + OneTimeRunner.Run(() => + { /* You can configure extra properties for the * entities defined in the modules used by your application. * @@ -39,6 +39,7 @@ public static class WmsEfCoreEntityExtensionMappings * See the documentation for more: * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities */ - }); + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs index 90e2fcf9d..42b11cc20 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs @@ -14,43 +14,44 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore; -namespace WinIn.FasterZ.Wms.EntityFrameworkCore; - -[DependsOn( - typeof(WmsDomainModule), - typeof(AbpIdentityEntityFrameworkCoreModule), - typeof(AbpOpenIddictEntityFrameworkCoreModule), - typeof(AbpPermissionManagementEntityFrameworkCoreModule), - typeof(AbpSettingManagementEntityFrameworkCoreModule), - typeof(AbpEntityFrameworkCoreSqlServerModule), - typeof(AbpBackgroundJobsEntityFrameworkCoreModule), - typeof(AbpAuditLoggingEntityFrameworkCoreModule), - typeof(AbpTenantManagementEntityFrameworkCoreModule), - typeof(AbpFeatureManagementEntityFrameworkCoreModule) - )] -public class WmsEntityFrameworkCoreModule : AbpModule +namespace WinIn.FasterZ.Wms.EntityFrameworkCore { - public override void PreConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(WmsDomainModule), + typeof(AbpIdentityEntityFrameworkCoreModule), + typeof(AbpOpenIddictEntityFrameworkCoreModule), + typeof(AbpPermissionManagementEntityFrameworkCoreModule), + typeof(AbpSettingManagementEntityFrameworkCoreModule), + typeof(AbpEntityFrameworkCoreSqlServerModule), + typeof(AbpBackgroundJobsEntityFrameworkCoreModule), + typeof(AbpAuditLoggingEntityFrameworkCoreModule), + typeof(AbpTenantManagementEntityFrameworkCoreModule), + typeof(AbpFeatureManagementEntityFrameworkCoreModule) + )] + public class WmsEntityFrameworkCoreModule : AbpModule { - WmsEfCoreEntityExtensionMappings.Configure(); - } + public override void PreConfigureServices(ServiceConfigurationContext context) + { + WmsEfCoreEntityExtensionMappings.Configure(); + } - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAbpDbContext(options => + public override void ConfigureServices(ServiceConfigurationContext context) { + context.Services.AddAbpDbContext(options => + { /* Remove "includeAllEntities: true" to create * default repositories only for aggregate roots */ - options.AddDefaultRepositories(includeAllEntities: true); - options.AddRepository(); - }); + options.AddDefaultRepositories(includeAllEntities: true); + options.AddRepository(); + }); - Configure(options => - { + Configure(options => + { /* The main point to change your DBMS. * See also WmsMigrationsDbContextFactory for EF Core tooling. */ - options.UseSqlServer(); - }); + options.UseSqlServer(); + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentEfCoreQueryableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentEfCoreQueryableExtensions.cs index 29a3c3261..a11eeb215 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentEfCoreQueryableExtensions.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentEfCoreQueryableExtensions.cs @@ -1,19 +1,20 @@ using System.Linq; using Microsoft.EntityFrameworkCore; -namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; - -public static class AuthDepartmentEfCoreQueryableExtensions +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment { - public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) + public static class AuthDepartmentEfCoreQueryableExtensions { - if (!include) + public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) { - return queryable; - } + if (!include) + { + return queryable; + } - return queryable - // .Include(x => x.xxx) // TODO: AbpHelper generated - ; + return queryable + // .Include(x => x.xxx) // TODO: AbpHelper generated + ; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentRepository.cs index 891519c08..8792b4c9d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentRepository.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentRepository.cs @@ -5,16 +5,17 @@ using WinIn.FasterZ.Wms.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; -namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; - -public class AuthDepartmentRepository : EfCoreRepository, IAuthDepartmentRepository +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment { - public AuthDepartmentRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + public class AuthDepartmentRepository : EfCoreRepository, IAuthDepartmentRepository { - } + public AuthDepartmentRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } - public override async Task> WithDetailsAsync() - { - return (await GetQueryableAsync()).IncludeDetails(); + public override async Task> WithDetailsAsync() + { + return (await GetQueryableAsync()).IncludeDetails(); + } } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Client/WmsHttpApiClientModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Client/WmsHttpApiClientModule.cs index 9e03372b5..d558aea5e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Client/WmsHttpApiClientModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Client/WmsHttpApiClientModule.cs @@ -8,31 +8,32 @@ using Volo.Abp.TenantManagement; using Volo.Abp.SettingManagement; using Volo.Abp.VirtualFileSystem; -namespace WinIn.FasterZ.Wms; - -[DependsOn( - typeof(WmsApplicationContractsModule), - typeof(AbpAccountHttpApiClientModule), - typeof(AbpIdentityHttpApiClientModule), - typeof(AbpPermissionManagementHttpApiClientModule), - typeof(AbpTenantManagementHttpApiClientModule), - typeof(AbpFeatureManagementHttpApiClientModule), - typeof(AbpSettingManagementHttpApiClientModule) -)] -public class WmsHttpApiClientModule : AbpModule +namespace WinIn.FasterZ.Wms { - public const string RemoteServiceName = "Default"; - - public override void ConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(WmsApplicationContractsModule), + typeof(AbpAccountHttpApiClientModule), + typeof(AbpIdentityHttpApiClientModule), + typeof(AbpPermissionManagementHttpApiClientModule), + typeof(AbpTenantManagementHttpApiClientModule), + typeof(AbpFeatureManagementHttpApiClientModule), + typeof(AbpSettingManagementHttpApiClientModule) + )] + public class WmsHttpApiClientModule : AbpModule { - context.Services.AddHttpClientProxies( - typeof(WmsApplicationContractsModule).Assembly, - RemoteServiceName - ); + public const string RemoteServiceName = "Default"; - Configure(options => + public override void ConfigureServices(ServiceConfigurationContext context) { - options.FileSets.AddEmbedded(); - }); + context.Services.AddHttpClientProxies( + typeof(WmsApplicationContractsModule).Assembly, + RemoteServiceName + ); + + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Controllers/HomeController.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Controllers/HomeController.cs index 03338e174..8be6bc4c9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Controllers/HomeController.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Controllers/HomeController.cs @@ -1,12 +1,13 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; -namespace WinIn.FasterZ.Wms.Controllers; - -public class HomeController : AbpController +namespace WinIn.FasterZ.Wms.Controllers { - public ActionResult Index() + public class HomeController : AbpController { - return Redirect("~/swagger"); + public ActionResult Index() + { + return Redirect("~/swagger"); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Program.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Program.cs index 9215c142b..7f3b90faa 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Program.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Program.cs @@ -6,51 +6,52 @@ using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; -namespace WinIn.FasterZ.Wms; - -public class Program +namespace WinIn.FasterZ.Wms { - public async static Task Main(string[] args) + public class Program { - Log.Logger = new LoggerConfiguration() + public async static Task Main(string[] args) + { + Log.Logger = new LoggerConfiguration() #if DEBUG - .MinimumLevel.Debug() + .MinimumLevel.Debug() #else .MinimumLevel.Information() #endif - .MinimumLevel.Override("Microsoft", LogEventLevel.Information) - .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning) - .Enrich.FromLogContext() - .WriteTo.Async(c => c.File("Logs/logs.txt")) - .WriteTo.Async(c => c.Console()) - .CreateLogger(); + .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning) + .Enrich.FromLogContext() + .WriteTo.Async(c => c.File("Logs/logs.txt")) + .WriteTo.Async(c => c.Console()) + .CreateLogger(); - try - { - Log.Information("Starting WinIn.FasterZ.Wms.HttpApi.Host."); - var builder = WebApplication.CreateBuilder(args); - builder.Host.AddAppSettingsSecretsJson() - .UseAutofac() - .UseSerilog(); - await builder.AddApplicationAsync(); - var app = builder.Build(); - await app.InitializeApplicationAsync(); - await app.RunAsync(); - return 0; - } - catch (Exception ex) - { - if (ex is HostAbortedException) + try { - throw; + Log.Information("Starting WinIn.FasterZ.Wms.HttpApi.Host."); + var builder = WebApplication.CreateBuilder(args); + builder.Host.AddAppSettingsSecretsJson() + .UseAutofac() + .UseSerilog(); + await builder.AddApplicationAsync(); + var app = builder.Build(); + await app.InitializeApplicationAsync(); + await app.RunAsync(); + return 0; } + catch (Exception ex) + { + if (ex is HostAbortedException) + { + throw; + } - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs index 8b53cec54..807cb13c9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs @@ -29,216 +29,217 @@ using Volo.Abp.Modularity; using Volo.Abp.Swashbuckle; using Volo.Abp.VirtualFileSystem; -namespace WinIn.FasterZ.Wms; - -using Volo.Abp.Application.Dtos; -using Volo.Abp.AspNetCore.Mvc.AntiForgery; -using Volo.Abp.FeatureManagement; -using Volo.Abp.PermissionManagement; - -[DependsOn( - typeof(WmsHttpApiModule), - typeof(AbpAutofacModule), - typeof(AbpCachingStackExchangeRedisModule), - typeof(AbpDistributedLockingModule), - typeof(AbpAspNetCoreMvcUiMultiTenancyModule), - typeof(WmsApplicationModule), - typeof(WmsEntityFrameworkCoreModule), - typeof(AbpAspNetCoreSerilogModule), - typeof(AbpSwashbuckleModule) -)] -public class WmsHttpApiHostModule : AbpModule +namespace WinIn.FasterZ.Wms { - public override void ConfigureServices(ServiceConfigurationContext context) + using Volo.Abp.Application.Dtos; + using Volo.Abp.AspNetCore.Mvc.AntiForgery; + using Volo.Abp.FeatureManagement; + using Volo.Abp.PermissionManagement; + + [DependsOn( + typeof(WmsHttpApiModule), + typeof(AbpAutofacModule), + typeof(AbpCachingStackExchangeRedisModule), + typeof(AbpDistributedLockingModule), + typeof(AbpAspNetCoreMvcUiMultiTenancyModule), + typeof(WmsApplicationModule), + typeof(WmsEntityFrameworkCoreModule), + typeof(AbpAspNetCoreSerilogModule), + typeof(AbpSwashbuckleModule) + )] + public class WmsHttpApiHostModule : AbpModule { - var configuration = context.Services.GetConfiguration(); - var hostingEnvironment = context.Services.GetHostingEnvironment(); + public override void ConfigureServices(ServiceConfigurationContext context) + { + var configuration = context.Services.GetConfiguration(); + var hostingEnvironment = context.Services.GetHostingEnvironment(); - Configure(options => + Configure(options => { options.AutoValidate = false; }); - ConfigureConventionalControllers(); - ConfigureAuthentication(context, configuration); - ConfigureCache(configuration); - ConfigureVirtualFileSystem(context); - ConfigureDataProtection(context, configuration, hostingEnvironment); - ConfigureDistributedLocking(context, configuration); - ConfigureCors(context, configuration); - ConfigureSwaggerServices(context, configuration); - - //÷ֵͷҳѯ - SetMaxMaxResultCount(); - } + ConfigureConventionalControllers(); + ConfigureAuthentication(context, configuration); + ConfigureCache(configuration); + ConfigureVirtualFileSystem(context); + ConfigureDataProtection(context, configuration, hostingEnvironment); + ConfigureDistributedLocking(context, configuration); + ConfigureCors(context, configuration); + ConfigureSwaggerServices(context, configuration); + + //÷ֵͷҳѯ + SetMaxMaxResultCount(); + } - private void ConfigureCache(IConfiguration configuration) - { - //Configure(options => { options.KeyPrefix = "Wms:"; }); - Configure(options => { options.KeyPrefix = "AuthSiteCenter:"; }); - } + private void ConfigureCache(IConfiguration configuration) + { + //Configure(options => { options.KeyPrefix = "Wms:"; }); + Configure(options => { options.KeyPrefix = "AuthSiteCenter:"; }); + } - private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) - { - var hostingEnvironment = context.Services.GetHostingEnvironment(); + private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) + { + var hostingEnvironment = context.Services.GetHostingEnvironment(); - if (hostingEnvironment.IsDevelopment()) + if (hostingEnvironment.IsDevelopment()) + { + Configure(options => + { + options.FileSets.ReplaceEmbeddedByPhysical( + Path.Combine(hostingEnvironment.ContentRootPath, + $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain.Shared")); + options.FileSets.ReplaceEmbeddedByPhysical( + Path.Combine(hostingEnvironment.ContentRootPath, + $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain")); + options.FileSets.ReplaceEmbeddedByPhysical( + Path.Combine(hostingEnvironment.ContentRootPath, + $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Application.Contracts")); + options.FileSets.ReplaceEmbeddedByPhysical( + Path.Combine(hostingEnvironment.ContentRootPath, + $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Application")); + }); + } + } + + private void ConfigureConventionalControllers() { - Configure(options => + Configure(options => { - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain.Shared")); - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain")); - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Application.Contracts")); - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Application")); + options.ConventionalControllers.Create(typeof(WmsApplicationModule).Assembly); }); } - } - private void ConfigureConventionalControllers() - { - Configure(options => + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { - options.ConventionalControllers.Create(typeof(WmsApplicationModule).Assembly); - }); - } - - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) - { - Configure(options => + Configure(options => { options.IsDynamicPermissionStoreEnabled = true; }); - Configure(options => + Configure(options => { options.IsDynamicFeatureStoreEnabled = true; }); - context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) - .AddJwtBearer(options => + context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(options => { options.Authority = configuration["AuthServer:Authority"]; options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); options.Audience = "Wms"; }); - } + } - private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) - { - context.Services.AddAbpSwaggerGenWithOAuth( - configuration["AuthServer:Authority"], - new Dictionary - { + private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) + { + context.Services.AddAbpSwaggerGenWithOAuth( + configuration["AuthServer:Authority"], + new Dictionary + { {"Wms", "Wms API"} - }, - options => - { - options.SwaggerDoc("v1", new OpenApiInfo { Title = "Wms API", Version = "v1" }); - options.DocInclusionPredicate((docName, description) => true); - options.CustomSchemaIds(type => type.FullName); - }); - } + }, + options => + { + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Wms API", Version = "v1" }); + options.DocInclusionPredicate((docName, description) => true); + options.CustomSchemaIds(type => type.FullName); + }); + } - private void ConfigureDataProtection( - ServiceConfigurationContext context, - IConfiguration configuration, - IWebHostEnvironment hostingEnvironment) - { - var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Wms"); - if (!hostingEnvironment.IsDevelopment()) + private void ConfigureDataProtection( + ServiceConfigurationContext context, + IConfiguration configuration, + IWebHostEnvironment hostingEnvironment) { - var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); - dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Wms-Protection-Keys"); + var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Wms"); + if (!hostingEnvironment.IsDevelopment()) + { + var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); + dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Wms-Protection-Keys"); + } } - } - private void ConfigureDistributedLocking( - ServiceConfigurationContext context, - IConfiguration configuration) - { - context.Services.AddSingleton(sp => + private void ConfigureDistributedLocking( + ServiceConfigurationContext context, + IConfiguration configuration) { - var connection = ConnectionMultiplexer - .Connect(configuration["Redis:Configuration"]); - return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); - }); - } + context.Services.AddSingleton(sp => + { + var connection = ConnectionMultiplexer + .Connect(configuration["Redis:Configuration"]); + return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); + }); + } - private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) - { - context.Services.AddCors(options => + private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) { - options.AddDefaultPolicy(builder => + context.Services.AddCors(options => { - builder - .WithOrigins(configuration["App:CorsOrigins"]? - .Split(",", StringSplitOptions.RemoveEmptyEntries) - .Select(o => o.RemovePostFix("/")) - .ToArray() ?? Array.Empty()) - .WithAbpExposedHeaders() - .SetIsOriginAllowedToAllowWildcardSubdomains() - .AllowAnyHeader() - .AllowAnyMethod() - .AllowCredentials(); + options.AddDefaultPolicy(builder => + { + builder + .WithOrigins(configuration["App:CorsOrigins"]? + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() ?? Array.Empty()) + .WithAbpExposedHeaders() + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); }); - }); - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - var env = context.GetEnvironment(); + } - if (env.IsDevelopment()) + public override void OnApplicationInitialization(ApplicationInitializationContext context) { - app.UseDeveloperExceptionPage(); - } + var app = context.GetApplicationBuilder(); + var env = context.GetEnvironment(); - app.UseAbpRequestLocalization(); - app.UseCorrelationId(); - app.UseStaticFiles(); - app.UseRouting(); - app.UseCors(); - app.UseAuthentication(); + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } - if (MultiTenancyConsts.IsEnabled) - { - app.UseMultiTenancy(); - } + app.UseAbpRequestLocalization(); + app.UseCorrelationId(); + app.UseStaticFiles(); + app.UseRouting(); + app.UseCors(); + app.UseAuthentication(); - app.UseAuthorization(); + if (MultiTenancyConsts.IsEnabled) + { + app.UseMultiTenancy(); + } - app.UseSwagger(); - app.UseAbpSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "Wms API"); + app.UseAuthorization(); - var configuration = context.GetConfiguration(); - options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]); - options.OAuthScopes("Wms"); - }); + app.UseSwagger(); + app.UseAbpSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Wms API"); - app.UseAuditing(); - app.UseAbpSerilogEnrichers(); - app.UseUnitOfWork(); - app.UseConfiguredEndpoints(); - } + var configuration = context.GetConfiguration(); + options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]); + options.OAuthScopes("Wms"); + }); - /// - /// ÷ֵͷҳѯ - /// - private void SetMaxMaxResultCount() - { - //LimitedResultRequestDto.MaxMaxResultCount = 50000000; - LimitedResultRequestDto.MaxMaxResultCount = int.MaxValue; + app.UseAuditing(); + app.UseAbpSerilogEnrichers(); + app.UseUnitOfWork(); + app.UseConfiguredEndpoints(); + } + + /// + /// ÷ֵͷҳѯ + /// + private void SetMaxMaxResultCount() + { + //LimitedResultRequestDto.MaxMaxResultCount = 50000000; + LimitedResultRequestDto.MaxMaxResultCount = int.MaxValue; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Controllers/WmsController.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Controllers/WmsController.cs index 1d4822a1e..f4c41b48c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Controllers/WmsController.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Controllers/WmsController.cs @@ -1,14 +1,15 @@ using WinIn.FasterZ.Wms.Localization; using Volo.Abp.AspNetCore.Mvc; -namespace WinIn.FasterZ.Wms.Controllers; - -/* Inherit your controllers from this class. - */ -public abstract class WmsController : AbpControllerBase +namespace WinIn.FasterZ.Wms.Controllers { - protected WmsController() + /* Inherit your controllers from this class. + */ + public abstract class WmsController : AbpControllerBase { - LocalizationResource = typeof(WmsResource); + protected WmsController() + { + LocalizationResource = typeof(WmsResource); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Models/Test/TestModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Models/Test/TestModel.cs index 23f226207..da47258ad 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Models/Test/TestModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/Models/Test/TestModel.cs @@ -1,10 +1,11 @@ using System; -namespace WinIn.FasterZ.Wms.Models.Test; - -public class TestModel +namespace WinIn.FasterZ.Wms.Models.Test { - public string Name { get; set; } + public class TestModel + { + public string Name { get; set; } - public DateTime BirthDate { get; set; } + public DateTime BirthDate { get; set; } + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/WmsHttpApiModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/WmsHttpApiModule.cs index a6f00f356..964cdc566 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/WmsHttpApiModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi/WmsHttpApiModule.cs @@ -9,33 +9,34 @@ using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; -namespace WinIn.FasterZ.Wms; - -[DependsOn( - typeof(WmsApplicationContractsModule), - typeof(AbpAccountHttpApiModule), - typeof(AbpIdentityHttpApiModule), - typeof(AbpPermissionManagementHttpApiModule), - typeof(AbpTenantManagementHttpApiModule), - typeof(AbpFeatureManagementHttpApiModule), - typeof(AbpSettingManagementHttpApiModule) - )] -public class WmsHttpApiModule : AbpModule +namespace WinIn.FasterZ.Wms { - public override void ConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(WmsApplicationContractsModule), + typeof(AbpAccountHttpApiModule), + typeof(AbpIdentityHttpApiModule), + typeof(AbpPermissionManagementHttpApiModule), + typeof(AbpTenantManagementHttpApiModule), + typeof(AbpFeatureManagementHttpApiModule), + typeof(AbpSettingManagementHttpApiModule) + )] + public class WmsHttpApiModule : AbpModule { - ConfigureLocalization(); - } + public override void ConfigureServices(ServiceConfigurationContext context) + { + ConfigureLocalization(); + } - private void ConfigureLocalization() - { - Configure(options => + private void ConfigureLocalization() { - options.Resources - .Get() - .AddBaseTypes( - typeof(AbpUiResource) - ); - }); + Configure(options => + { + options.Resources + .Get() + .AddBaseTypes( + typeof(AbpUiResource) + ); + }); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Components/Toolbar/LoginLink/LoginLinkViewComponent.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Components/Toolbar/LoginLink/LoginLinkViewComponent.cs index d20335700..f59fe60d1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Components/Toolbar/LoginLink/LoginLinkViewComponent.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Components/Toolbar/LoginLink/LoginLinkViewComponent.cs @@ -1,12 +1,13 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; -namespace WinIn.FasterZ.Wms.Web.Components.Toolbar.LoginLink; - -public class LoginLinkViewComponent : AbpViewComponent +namespace WinIn.FasterZ.Wms.Web.Components.Toolbar.LoginLink { - public virtual IViewComponentResult Invoke() + public class LoginLinkViewComponent : AbpViewComponent { - return View("~/Components/Toolbar/LoginLink/Default.cshtml"); + public virtual IViewComponentResult Invoke() + { + return View("~/Components/Toolbar/LoginLink/Default.cshtml"); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Controllers/AccountController.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Controllers/AccountController.cs index 2a82411cd..db3d8b34c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Controllers/AccountController.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Controllers/AccountController.cs @@ -1,8 +1,9 @@ using Volo.Abp.AspNetCore.Mvc.Authentication; -namespace WinIn.FasterZ.Wms.Web.Controllers; - -public class AccountController : ChallengeAccountController +namespace WinIn.FasterZ.Wms.Web.Controllers { + public class AccountController : ChallengeAccountController + { + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs index 8cce0c6ff..c3e97f048 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs @@ -13,75 +13,76 @@ using Volo.Abp.TenantManagement.Web.Navigation; using Volo.Abp.UI.Navigation; using Volo.Abp.Users; -namespace WinIn.FasterZ.Wms.Web.Menus; - -public class WmsMenuContributor : IMenuContributor +namespace WinIn.FasterZ.Wms.Web.Menus { - private readonly IConfiguration _configuration; - - public WmsMenuContributor(IConfiguration configuration) + public class WmsMenuContributor : IMenuContributor { - _configuration = configuration; - } + private readonly IConfiguration _configuration; - public async Task ConfigureMenuAsync(MenuConfigurationContext context) - { - if (context.Menu.Name == StandardMenus.Main) + public WmsMenuContributor(IConfiguration configuration) { - await ConfigureMainMenuAsync(context); + _configuration = configuration; } - else if (context.Menu.Name == StandardMenus.User) + + public async Task ConfigureMenuAsync(MenuConfigurationContext context) { - await ConfigureUserMenuAsync(context); + if (context.Menu.Name == StandardMenus.Main) + { + await ConfigureMainMenuAsync(context); + } + else if (context.Menu.Name == StandardMenus.User) + { + await ConfigureUserMenuAsync(context); + } } - } - private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) - { - var administration = context.Menu.GetAdministration(); - var l = context.GetLocalizer(); + private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) + { + var administration = context.Menu.GetAdministration(); + var l = context.GetLocalizer(); - context.Menu.Items.Insert( - 0, - new ApplicationMenuItem( - WmsMenus.Home, - l["Menu:Home"], - "~/", - icon: "fas fa-home", - order: 0 - ) - ); + context.Menu.Items.Insert( + 0, + new ApplicationMenuItem( + WmsMenus.Home, + l["Menu:Home"], + "~/", + icon: "fas fa-home", + order: 0 + ) + ); - if (MultiTenancyConsts.IsEnabled) - { - administration.SetSubItemOrder(TenantManagementMenuNames.GroupName, 1); - } - else - { - administration.TryRemoveMenuItem(TenantManagementMenuNames.GroupName); - } + if (MultiTenancyConsts.IsEnabled) + { + administration.SetSubItemOrder(TenantManagementMenuNames.GroupName, 1); + } + else + { + administration.TryRemoveMenuItem(TenantManagementMenuNames.GroupName); + } - administration.SetSubItemOrder(IdentityMenuNames.GroupName, 2); - administration.SetSubItemOrder(SettingManagementMenuNames.GroupName, 3); + administration.SetSubItemOrder(IdentityMenuNames.GroupName, 2); + administration.SetSubItemOrder(SettingManagementMenuNames.GroupName, 3); - if (await context.IsGrantedAsync(WmsPermissions.AuthDepartment.Default)) - { - context.Menu.GetAdministration().AddItem( - new ApplicationMenuItem(WmsMenus.AuthDepartment, l["Menu:AuthDepartment"], "/Z_Business/AuthDepartment/AuthDepartment") - ); + if (await context.IsGrantedAsync(WmsPermissions.AuthDepartment.Default)) + { + context.Menu.GetAdministration().AddItem( + new ApplicationMenuItem(WmsMenus.AuthDepartment, l["Menu:AuthDepartment"], "/Z_Business/AuthDepartment/AuthDepartment") + ); + } } - } - private Task ConfigureUserMenuAsync(MenuConfigurationContext context) - { - var l = context.GetLocalizer(); - var accountStringLocalizer = context.GetLocalizer(); - var authServerUrl = _configuration["AuthServer:Authority"] ?? ""; + private Task ConfigureUserMenuAsync(MenuConfigurationContext context) + { + var l = context.GetLocalizer(); + var accountStringLocalizer = context.GetLocalizer(); + var authServerUrl = _configuration["AuthServer:Authority"] ?? ""; - context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["MyAccount"], - $"{authServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}", icon: "fa fa-cog", order: 1000, null, "_blank").RequireAuthenticated()); - context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000).RequireAuthenticated()); + context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["MyAccount"], + $"{authServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}", icon: "fa fa-cog", order: 1000, null, "_blank").RequireAuthenticated()); + context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000).RequireAuthenticated()); - return Task.CompletedTask; + return Task.CompletedTask; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs index 6ea13aa70..225ca3a2a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs @@ -1,11 +1,12 @@ -namespace WinIn.FasterZ.Wms.Web.Menus; - -public class WmsMenus +namespace WinIn.FasterZ.Wms.Web.Menus { - private const string Prefix = "Wms"; - public const string Home = Prefix + ".Home"; + public class WmsMenus + { + private const string Prefix = "Wms"; + public const string Home = Prefix + ".Home"; - //Add your menu items here... + //Add your menu items here... - public const string AuthDepartment = Prefix + ".AuthDepartment"; + public const string AuthDepartment = Prefix + ".AuthDepartment"; + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsToolbarContributor.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsToolbarContributor.cs index 702dd4db5..da4351a56 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsToolbarContributor.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsToolbarContributor.cs @@ -4,22 +4,23 @@ using WinIn.FasterZ.Wms.Web.Components.Toolbar.LoginLink; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars; using Volo.Abp.Users; -namespace WinIn.FasterZ.Wms.Web.Menus; - -public class WmsToolbarContributor : IToolbarContributor +namespace WinIn.FasterZ.Wms.Web.Menus { - public virtual Task ConfigureToolbarAsync(IToolbarConfigurationContext context) + public class WmsToolbarContributor : IToolbarContributor { - if (context.Toolbar.Name != StandardToolbars.Main) + public virtual Task ConfigureToolbarAsync(IToolbarConfigurationContext context) { - return Task.CompletedTask; - } + if (context.Toolbar.Name != StandardToolbars.Main) + { + return Task.CompletedTask; + } - if (!context.ServiceProvider.GetRequiredService().IsAuthenticated) - { - context.Toolbar.Items.Add(new ToolbarItem(typeof(LoginLinkViewComponent))); - } + if (!context.ServiceProvider.GetRequiredService().IsAuthenticated) + { + context.Toolbar.Items.Add(new ToolbarItem(typeof(LoginLinkViewComponent))); + } - return Task.CompletedTask; + return Task.CompletedTask; + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Index.cshtml.cs index 244287c63..86c87656e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Index.cshtml.cs @@ -1,17 +1,18 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; -namespace WinIn.FasterZ.Wms.Web.Pages; - -public class IndexModel : WmsPageModel +namespace WinIn.FasterZ.Wms.Web.Pages { - public void OnGet() + public class IndexModel : WmsPageModel { + public void OnGet() + { - } + } - public async Task OnPostLoginAsync() - { - await HttpContext.ChallengeAsync("oidc"); + public async Task OnPostLoginAsync() + { + await HttpContext.ChallengeAsync("oidc"); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/WmsPageModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/WmsPageModel.cs index 58cefd9a7..2401477bd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/WmsPageModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/WmsPageModel.cs @@ -1,12 +1,13 @@ using WinIn.FasterZ.Wms.Localization; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; -namespace WinIn.FasterZ.Wms.Web.Pages; - -public abstract class WmsPageModel : AbpPageModel +namespace WinIn.FasterZ.Wms.Web.Pages { - protected WmsPageModel() + public abstract class WmsPageModel : AbpPageModel { - LocalizationResourceType = typeof(WmsResource); + protected WmsPageModel() + { + LocalizationResourceType = typeof(WmsResource); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml.cs index fdd2dcf1f..dfa273f45 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml.cs @@ -4,24 +4,25 @@ using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; using WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.ViewModels; -namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment; - -public class CreateModalModel : WmsPageModel +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment { - [BindProperty] - public CreateEditAuthDepartmentViewModel ViewModel { get; set; } + public class CreateModalModel : WmsPageModel + { + [BindProperty] + public CreateEditAuthDepartmentViewModel ViewModel { get; set; } - private readonly IAuthDepartmentAppService _service; + private readonly IAuthDepartmentAppService _service; - public CreateModalModel(IAuthDepartmentAppService service) - { - _service = service; - } + public CreateModalModel(IAuthDepartmentAppService service) + { + _service = service; + } - public virtual async Task OnPostAsync() - { - var dto = ObjectMapper.Map(ViewModel); - await _service.CreateAsync(dto); - return NoContent(); + public virtual async Task OnPostAsync() + { + var dto = ObjectMapper.Map(ViewModel); + await _service.CreateAsync(dto); + return NoContent(); + } } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml.cs index be3949a9d..e6c668266 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml.cs @@ -5,34 +5,35 @@ using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; using WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.ViewModels; -namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment; - -public class EditModalModel : WmsPageModel +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment { - [HiddenInput] - [BindProperty(SupportsGet = true)] - public Guid Id { get; set; } + public class EditModalModel : WmsPageModel + { + [HiddenInput] + [BindProperty(SupportsGet = true)] + public Guid Id { get; set; } - [BindProperty] - public CreateEditAuthDepartmentViewModel ViewModel { get; set; } + [BindProperty] + public CreateEditAuthDepartmentViewModel ViewModel { get; set; } - private readonly IAuthDepartmentAppService _service; + private readonly IAuthDepartmentAppService _service; - public EditModalModel(IAuthDepartmentAppService service) - { - _service = service; - } + public EditModalModel(IAuthDepartmentAppService service) + { + _service = service; + } - public virtual async Task OnGetAsync() - { - var dto = await _service.GetAsync(Id); - ViewModel = ObjectMapper.Map(dto); - } + public virtual async Task OnGetAsync() + { + var dto = await _service.GetAsync(Id); + ViewModel = ObjectMapper.Map(dto); + } - public virtual async Task OnPostAsync() - { - var dto = ObjectMapper.Map(ViewModel); - await _service.UpdateAsync(Id, dto); - return NoContent(); + public virtual async Task OnPostAsync() + { + var dto = ObjectMapper.Map(ViewModel); + await _service.UpdateAsync(Id, dto); + return NoContent(); + } } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml.cs index 87bae5eba..b5f828835 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml.cs @@ -3,41 +3,42 @@ using System.Threading.Tasks; using System.ComponentModel.DataAnnotations; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; -namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment; - -public class IndexModel : WmsPageModel +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment { - public AuthDepartmentFilterInput AuthDepartmentFilter { get; set; } - - public virtual async Task OnGetAsync() + public class IndexModel : WmsPageModel { - await Task.CompletedTask; + public AuthDepartmentFilterInput AuthDepartmentFilter { get; set; } + + public virtual async Task OnGetAsync() + { + await Task.CompletedTask; + } } -} -public class AuthDepartmentFilterInput -{ - [FormControlSize(AbpFormControlSize.Small)] - [Display(Name = "AuthDepartmentCode")] - public string? Code { get; set; } + public class AuthDepartmentFilterInput + { + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentCode")] + public string? Code { get; set; } - [FormControlSize(AbpFormControlSize.Small)] - [Display(Name = "AuthDepartmentDescription")] - public string? Description { get; set; } + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentDescription")] + public string? Description { get; set; } - [FormControlSize(AbpFormControlSize.Small)] - [Display(Name = "AuthDepartmentId")] - public Guid? Id { get; set; } + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentId")] + public Guid? Id { get; set; } - [FormControlSize(AbpFormControlSize.Small)] - [Display(Name = "AuthDepartmentIsActive")] - public bool? IsActive { get; set; } + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentIsActive")] + public bool? IsActive { get; set; } - [FormControlSize(AbpFormControlSize.Small)] - [Display(Name = "AuthDepartmentName")] - public string? Name { get; set; } + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentName")] + public string? Name { get; set; } - [FormControlSize(AbpFormControlSize.Small)] - [Display(Name = "AuthDepartmentRemark")] - public string? Remark { get; set; } + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentRemark")] + public string? Remark { get; set; } + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsBrandingProvider.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsBrandingProvider.cs index 8c251f4e0..bbead8c6b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsBrandingProvider.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsBrandingProvider.cs @@ -1,10 +1,11 @@ using Volo.Abp.Ui.Branding; using Volo.Abp.DependencyInjection; -namespace WinIn.FasterZ.Wms.Web; - -[Dependency(ReplaceServices = true)] -public class WmsBrandingProvider : DefaultBrandingProvider +namespace WinIn.FasterZ.Wms.Web { - public override string AppName => "Wms"; + [Dependency(ReplaceServices = true)] + public class WmsBrandingProvider : DefaultBrandingProvider + { + public override string AppName => "Wms"; + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs index f581bc333..048d1d545 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs @@ -2,14 +2,15 @@ using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; using WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.ViewModels; using AutoMapper; -namespace WinIn.FasterZ.Wms.Web; - -public class WmsWebAutoMapperProfile : Profile +namespace WinIn.FasterZ.Wms.Web { - public WmsWebAutoMapperProfile() + public class WmsWebAutoMapperProfile : Profile { - //Define your AutoMapper configuration here for the Web project. - CreateMap(); - CreateMap(); + public WmsWebAutoMapperProfile() + { + //Define your AutoMapper configuration here for the Web project. + CreateMap(); + CreateMap(); + } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebModule.cs index 4ea0ad706..5a6b716dc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebModule.cs @@ -45,233 +45,234 @@ using Volo.Abp.UI; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; -namespace WinIn.FasterZ.Wms.Web; - -[DependsOn( - typeof(WmsHttpApiClientModule), - typeof(WmsHttpApiModule), - typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule), - typeof(AbpAspNetCoreMvcClientModule), - typeof(AbpHttpClientWebModule), - typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), - typeof(AbpAutofacModule), - typeof(AbpCachingStackExchangeRedisModule), - typeof(AbpDistributedLockingModule), - typeof(AbpSettingManagementWebModule), - typeof(AbpHttpClientIdentityModelWebModule), - typeof(AbpIdentityWebModule), - typeof(AbpTenantManagementWebModule), - typeof(AbpAspNetCoreSerilogModule), - typeof(AbpSwashbuckleModule) - )] -public class WmsWebModule : AbpModule +namespace WinIn.FasterZ.Wms.Web { - public override void PreConfigureServices(ServiceConfigurationContext context) + [DependsOn( + typeof(WmsHttpApiClientModule), + typeof(WmsHttpApiModule), + typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule), + typeof(AbpAspNetCoreMvcClientModule), + typeof(AbpHttpClientWebModule), + typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), + typeof(AbpAutofacModule), + typeof(AbpCachingStackExchangeRedisModule), + typeof(AbpDistributedLockingModule), + typeof(AbpSettingManagementWebModule), + typeof(AbpHttpClientIdentityModelWebModule), + typeof(AbpIdentityWebModule), + typeof(AbpTenantManagementWebModule), + typeof(AbpAspNetCoreSerilogModule), + typeof(AbpSwashbuckleModule) + )] + public class WmsWebModule : AbpModule { - context.Services.PreConfigure(options => + public override void PreConfigureServices(ServiceConfigurationContext context) { - options.AddAssemblyResource( - typeof(WmsResource), - typeof(WmsDomainSharedModule).Assembly, - typeof(WmsApplicationContractsModule).Assembly, - typeof(WmsWebModule).Assembly - ); - }); - } + context.Services.PreConfigure(options => + { + options.AddAssemblyResource( + typeof(WmsResource), + typeof(WmsDomainSharedModule).Assembly, + typeof(WmsApplicationContractsModule).Assembly, + typeof(WmsWebModule).Assembly + ); + }); + } - public override void ConfigureServices(ServiceConfigurationContext context) - { - var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.GetConfiguration(); + public override void ConfigureServices(ServiceConfigurationContext context) + { + var hostingEnvironment = context.Services.GetHostingEnvironment(); + var configuration = context.Services.GetConfiguration(); - ConfigureBundles(); - ConfigureCache(); - ConfigureDataProtection(context, configuration, hostingEnvironment); - ConfigureDistributedLocking(context, configuration); - ConfigureUrls(configuration); - ConfigureAuthentication(context, configuration); - ConfigureAutoMapper(); - ConfigureVirtualFileSystem(hostingEnvironment); - ConfigureNavigationServices(configuration); - ConfigureMultiTenancy(); - ConfigureSwaggerServices(context.Services); - } + ConfigureBundles(); + ConfigureCache(); + ConfigureDataProtection(context, configuration, hostingEnvironment); + ConfigureDistributedLocking(context, configuration); + ConfigureUrls(configuration); + ConfigureAuthentication(context, configuration); + ConfigureAutoMapper(); + ConfigureVirtualFileSystem(hostingEnvironment); + ConfigureNavigationServices(configuration); + ConfigureMultiTenancy(); + ConfigureSwaggerServices(context.Services); + } - private void ConfigureBundles() - { - Configure(options => + private void ConfigureBundles() { - options.StyleBundles.Configure( - LeptonXLiteThemeBundles.Styles.Global, - bundle => - { - bundle.AddFiles("/global-styles.css"); - } - ); - }); - } + Configure(options => + { + options.StyleBundles.Configure( + LeptonXLiteThemeBundles.Styles.Global, + bundle => + { + bundle.AddFiles("/global-styles.css"); + } + ); + }); + } - private void ConfigureCache() - { - Configure(options => + private void ConfigureCache() { - options.KeyPrefix = "Wms:"; - }); - } + Configure(options => + { + options.KeyPrefix = "Wms:"; + }); + } - private void ConfigureUrls(IConfiguration configuration) - { - Configure(options => + private void ConfigureUrls(IConfiguration configuration) { - options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; - }); - } + Configure(options => + { + options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; + }); + } - private void ConfigureMultiTenancy() - { - Configure(options => + private void ConfigureMultiTenancy() { - options.IsEnabled = MultiTenancyConsts.IsEnabled; - }); - } - - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) - { - context.Services.AddAuthentication(options => - { - options.DefaultScheme = "Cookies"; - options.DefaultChallengeScheme = "oidc"; - }) - .AddCookie("Cookies", options => + Configure(options => { - options.ExpireTimeSpan = TimeSpan.FromDays(365); - options.CheckTokenExpiration(); - }) - .AddAbpOpenIdConnect("oidc", options => - { - options.Authority = configuration["AuthServer:Authority"]; - options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); - options.ResponseType = OpenIdConnectResponseType.CodeIdToken; + options.IsEnabled = MultiTenancyConsts.IsEnabled; + }); + } - options.ClientId = configuration["AuthServer:ClientId"]; - options.ClientSecret = configuration["AuthServer:ClientSecret"]; + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) + { + context.Services.AddAuthentication(options => + { + options.DefaultScheme = "Cookies"; + options.DefaultChallengeScheme = "oidc"; + }) + .AddCookie("Cookies", options => + { + options.ExpireTimeSpan = TimeSpan.FromDays(365); + options.CheckTokenExpiration(); + }) + .AddAbpOpenIdConnect("oidc", options => + { + options.Authority = configuration["AuthServer:Authority"]; + options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); + options.ResponseType = OpenIdConnectResponseType.CodeIdToken; + + options.ClientId = configuration["AuthServer:ClientId"]; + options.ClientSecret = configuration["AuthServer:ClientSecret"]; - options.UsePkce = true; - options.SaveTokens = true; - options.GetClaimsFromUserInfoEndpoint = true; + options.UsePkce = true; + options.SaveTokens = true; + options.GetClaimsFromUserInfoEndpoint = true; - options.Scope.Add("roles"); - options.Scope.Add("email"); - options.Scope.Add("phone"); - options.Scope.Add("Wms"); + options.Scope.Add("roles"); + options.Scope.Add("email"); + options.Scope.Add("phone"); + options.Scope.Add("Wms"); + }); + } + + private void ConfigureAutoMapper() + { + Configure(options => + { + options.AddMaps(); }); - } + } - private void ConfigureAutoMapper() - { - Configure(options => + private void ConfigureVirtualFileSystem(IWebHostEnvironment hostingEnvironment) { - options.AddMaps(); - }); - } + if (hostingEnvironment.IsDevelopment()) + { + Configure(options => + { + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain.Shared")); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Application.Contracts")); + options.FileSets.ReplaceEmbeddedByPhysical(hostingEnvironment.ContentRootPath); + }); + } + } - private void ConfigureVirtualFileSystem(IWebHostEnvironment hostingEnvironment) - { - if (hostingEnvironment.IsDevelopment()) + private void ConfigureNavigationServices(IConfiguration configuration) { - Configure(options => + Configure(options => { - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Domain.Shared")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}WinIn.FasterZ.Wms.Application.Contracts")); - options.FileSets.ReplaceEmbeddedByPhysical(hostingEnvironment.ContentRootPath); + options.MenuContributors.Add(new WmsMenuContributor(configuration)); + }); + + Configure(options => + { + options.Contributors.Add(new WmsToolbarContributor()); }); } - } - private void ConfigureNavigationServices(IConfiguration configuration) - { - Configure(options => + private void ConfigureSwaggerServices(IServiceCollection services) { - options.MenuContributors.Add(new WmsMenuContributor(configuration)); - }); + services.AddAbpSwaggerGen( + options => + { + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Wms API", Version = "v1" }); + options.DocInclusionPredicate((docName, description) => true); + options.CustomSchemaIds(type => type.FullName); + } + ); + } - Configure(options => + private void ConfigureDataProtection( + ServiceConfigurationContext context, + IConfiguration configuration, + IWebHostEnvironment hostingEnvironment) { - options.Contributors.Add(new WmsToolbarContributor()); - }); - } - - private void ConfigureSwaggerServices(IServiceCollection services) - { - services.AddAbpSwaggerGen( - options => + var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Wms"); + if (!hostingEnvironment.IsDevelopment()) { - options.SwaggerDoc("v1", new OpenApiInfo { Title = "Wms API", Version = "v1" }); - options.DocInclusionPredicate((docName, description) => true); - options.CustomSchemaIds(type => type.FullName); + var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); + dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Wms-Protection-Keys"); } - ); - } + } - private void ConfigureDataProtection( - ServiceConfigurationContext context, - IConfiguration configuration, - IWebHostEnvironment hostingEnvironment) - { - var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Wms"); - if (!hostingEnvironment.IsDevelopment()) + private void ConfigureDistributedLocking( + ServiceConfigurationContext context, + IConfiguration configuration) { - var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); - dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Wms-Protection-Keys"); + context.Services.AddSingleton(sp => + { + var connection = ConnectionMultiplexer + .Connect(configuration["Redis:Configuration"]); + return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); + }); } - } - private void ConfigureDistributedLocking( - ServiceConfigurationContext context, - IConfiguration configuration) - { - context.Services.AddSingleton(sp => + public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var connection = ConnectionMultiplexer - .Connect(configuration["Redis:Configuration"]); - return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); - }); - } + var app = context.GetApplicationBuilder(); + var env = context.GetEnvironment(); - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - var env = context.GetEnvironment(); + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } + app.UseAbpRequestLocalization(); - app.UseAbpRequestLocalization(); + if (!env.IsDevelopment()) + { + app.UseErrorPage(); + } - if (!env.IsDevelopment()) - { - app.UseErrorPage(); - } + app.UseCorrelationId(); + app.UseStaticFiles(); + app.UseRouting(); + app.UseAuthentication(); - app.UseCorrelationId(); - app.UseStaticFiles(); - app.UseRouting(); - app.UseAuthentication(); + if (MultiTenancyConsts.IsEnabled) + { + app.UseMultiTenancy(); + } - if (MultiTenancyConsts.IsEnabled) - { - app.UseMultiTenancy(); + app.UseAuthorization(); + app.UseSwagger(); + app.UseAbpSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Wms API"); + }); + app.UseAbpSerilogEnrichers(); + app.UseConfiguredEndpoints(); } - - app.UseAuthorization(); - app.UseSwagger(); - app.UseAbpSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "Wms API"); - }); - app.UseAbpSerilogEnrichers(); - app.UseConfiguredEndpoints(); } }