From 7a183ccd94d6ea10fe53235596f0c1b9e110bcf8 Mon Sep 17 00:00:00 2001 From: PhilPan Date: Fri, 5 May 2023 19:44:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/DictConst.cs | 0 .../Consts/ModuleConst.cs | 0 .../Dto/BasEbom/EbomListOutput.cs | 0 .../Dto/BasEbom/EbomTreeOutput.cs | 0 .../Dto/BasEbom/EbomTreeQueryInput.cs | 0 .../Dto/BasMbom/MbomDataOutput.cs | 0 .../Dto/BasMbom/MbomListOutput.cs | 0 .../Dto/BasMbom/MbomSaveDataInput.cs | 0 .../Dto/BasProcess/ProcessListOutput.cs | 0 .../Dto/BasProcess/ProcessStationInput.cs | 0 .../Dto/ElementSelectDto.cs | 0 .../Dto/ProcessManage/RouteLineTreeOutput.cs | 0 .../Entity/BasEbomD.cs | 0 .../Entity/BasEbomH.cs | 0 .../Entity/BasItem.cs | 0 .../Entity/BasMaterial.cs | 0 .../Entity/BasMaterialUnit.cs | 0 .../Entity/BasMbom.cs | 0 .../Entity/BasMbomInput.cs | 0 .../Entity/BasMbomOutput.cs | 0 .../Entity/BasMbomOutputExt.cs | 0 .../Entity/BasMbomProcess.cs | 0 .../Entity/BasProcess.cs | 0 .../Entity/BasProcessStation.cs | 0 .../Entity/BasRouteD.cs | 0 .../Entity/BasRouteH.cs | 0 .../Mapper/Mapper.cs | 0 .../Model/RouteModel.cs | 0 .../Tnb.BasicData.Entities.csproj | 1 + .../IBasProcessService.cs | 9 +------ .../Tnb.BasicData.Interfaces.csproj | 7 +++-- .../Consts/DictionaryConstants.cs | 0 .../Consts/ModuleConst.cs | 0 .../Dto/PrdManage/EquipmentListOutput.cs | 0 .../Dto/PrdManage/IcmoUpInput.cs | 0 .../Dto/PrdManage/MoCrInput.cs | 0 .../Dto/PrdManage/MoldListOutput.cs | 0 .../Dto/PrdManage/PrdTaskOperInput.cs | 0 .../Dto/PrdManage/PrdTaskOperOutput.cs | 0 .../Dto/PrdManage/PrdTaskReleaseUpInput.cs | 0 .../Dto/PrdManage/PrdTaskSortOutput.cs | 0 .../PrdManage/ProductionSchedulingCrInput.cs | 0 .../Dto/PrdManage/SwapMoldUpInput.cs | 0 .../Dto/PrdManage/TaskOperRecordOutput.cs | 0 .../Dto/PrdManage/TransferPlatformUpInput.cs | 0 .../Entity/Molds.cs | 0 .../Entity/MoldsEntity.cs | 0 .../Entity/PrdMo.cs | 0 .../Entity/PrdTask.cs | 0 .../Entity/PrdTaskLog.cs | 0 .../Mapper/Mapper.cs | 0 .../Tnb.ProductionMgr.Entities.csproj | 2 +- .../Tnb.ProductionMgr.Interfaces.csproj | 6 ++--- Tnb.Server.sln | 26 +++++++++---------- 54 files changed, 22 insertions(+), 29 deletions(-) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Consts/DictConst.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Consts/ModuleConst.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasEbom/EbomListOutput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasEbom/EbomTreeOutput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasEbom/EbomTreeQueryInput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasMbom/MbomDataOutput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasMbom/MbomListOutput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasMbom/MbomSaveDataInput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasProcess/ProcessListOutput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/BasProcess/ProcessStationInput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/ElementSelectDto.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Dto/ProcessManage/RouteLineTreeOutput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasEbomD.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasEbomH.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasItem.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasMaterial.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasMaterialUnit.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasMbom.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasMbomInput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasMbomOutput.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasMbomOutputExt.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasMbomProcess.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasProcess.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasProcessStation.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasRouteD.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Entity/BasRouteH.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Mapper/Mapper.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Model/RouteModel.cs (100%) rename BasicData/{Tnb.BasicData.Entitys => Tnb.BasicData.Entities}/Tnb.BasicData.Entities.csproj (87%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Consts/DictionaryConstants.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Consts/ModuleConst.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/EquipmentListOutput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/IcmoUpInput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/MoCrInput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/MoldListOutput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/PrdTaskOperInput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/PrdTaskOperOutput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/PrdTaskReleaseUpInput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/PrdTaskSortOutput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/ProductionSchedulingCrInput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/SwapMoldUpInput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/TaskOperRecordOutput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Dto/PrdManage/TransferPlatformUpInput.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Entity/Molds.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Entity/MoldsEntity.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Entity/PrdMo.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Entity/PrdTask.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Entity/PrdTaskLog.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Mapper/Mapper.cs (100%) rename ProductionMgr/{Tnb.ProductionMgr.Entitys => Tnb.ProductionMgr.Entities}/Tnb.ProductionMgr.Entities.csproj (84%) diff --git a/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs rename to BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Consts/ModuleConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/ModuleConst.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Consts/ModuleConst.cs rename to BasicData/Tnb.BasicData.Entities/Consts/ModuleConst.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomListOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomListOutput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomListOutput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomListOutput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeOutput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeQueryInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeQueryInput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeQueryInput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeQueryInput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomDataOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomDataOutput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomListOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomListOutput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomListOutput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomListOutput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomSaveDataInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomSaveDataInput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasProcess/ProcessListOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessListOutput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasProcess/ProcessListOutput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessListOutput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasProcess/ProcessStationInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessStationInput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/BasProcess/ProcessStationInput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessStationInput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/ElementSelectDto.cs b/BasicData/Tnb.BasicData.Entities/Dto/ElementSelectDto.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/ElementSelectDto.cs rename to BasicData/Tnb.BasicData.Entities/Dto/ElementSelectDto.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/ProcessManage/RouteLineTreeOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/ProcessManage/RouteLineTreeOutput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Dto/ProcessManage/RouteLineTreeOutput.cs rename to BasicData/Tnb.BasicData.Entities/Dto/ProcessManage/RouteLineTreeOutput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomD.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasEbomD.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomH.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasEbomH.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasItem.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasItem.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasItem.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasItem.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterial.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasMaterial.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterialUnit.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialUnit.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasMaterialUnit.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasMaterialUnit.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbom.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasMbom.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMbomInput.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasMbomInput.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMbomOutput.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasMbomOutput.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMbomOutputExt.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutputExt.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasMbomOutputExt.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutputExt.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMbomProcess.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasMbomProcess.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasProcess.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProcess.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasProcess.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasProcess.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessStation.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasProcessStation.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasRouteD.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasRouteD.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasRouteD.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasRouteD.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasRouteH.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasRouteH.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Entity/BasRouteH.cs rename to BasicData/Tnb.BasicData.Entities/Entity/BasRouteH.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Mapper/Mapper.cs b/BasicData/Tnb.BasicData.Entities/Mapper/Mapper.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Mapper/Mapper.cs rename to BasicData/Tnb.BasicData.Entities/Mapper/Mapper.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Model/RouteModel.cs b/BasicData/Tnb.BasicData.Entities/Model/RouteModel.cs similarity index 100% rename from BasicData/Tnb.BasicData.Entitys/Model/RouteModel.cs rename to BasicData/Tnb.BasicData.Entities/Model/RouteModel.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Tnb.BasicData.Entities.csproj b/BasicData/Tnb.BasicData.Entities/Tnb.BasicData.Entities.csproj similarity index 87% rename from BasicData/Tnb.BasicData.Entitys/Tnb.BasicData.Entities.csproj rename to BasicData/Tnb.BasicData.Entities/Tnb.BasicData.Entities.csproj index e161f1b4..77f4adb8 100644 --- a/BasicData/Tnb.BasicData.Entitys/Tnb.BasicData.Entities.csproj +++ b/BasicData/Tnb.BasicData.Entities/Tnb.BasicData.Entities.csproj @@ -5,6 +5,7 @@ net6.0 enable enable + False diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasProcessService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasProcessService.cs index e4c7c880..594f103b 100644 --- a/BasicData/Tnb.BasicData.Interfaces/IBasProcessService.cs +++ b/BasicData/Tnb.BasicData.Interfaces/IBasProcessService.cs @@ -5,13 +5,6 @@ using Tnb.BasicData.Entities.Dto; namespace Tnb.BasicData.Interfaces { public interface IBasProcessService - { - OverideVisualDevFunc OverideFuncs { get; } - - /// - /// 重写新增 - /// - /// - public Task Create(VisualDevModelDataCrInput visualDevModelDataCrInput); + { } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj b/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj index 312602bf..6d21950f 100644 --- a/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj +++ b/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj @@ -1,16 +1,15 @@ - + net6.0 enable enable - True + False - - + diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/DictionaryConstants.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Consts/DictionaryConstants.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/DictionaryConstants.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Consts/DictionaryConstants.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/ModuleConst.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Consts/ModuleConst.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/ModuleConst.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Consts/ModuleConst.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/EquipmentListOutput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/EquipmentListOutput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/IcmoUpInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/IcmoUpInput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/IcmoUpInput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/IcmoUpInput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/MoCrInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MoCrInput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/MoCrInput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MoCrInput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/MoldListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MoldListOutput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/MoldListOutput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MoldListOutput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskOperInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskOperInput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskOperInput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskOperInput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskOperOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskOperOutput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskOperOutput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskOperOutput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskReleaseUpInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskReleaseUpInput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskReleaseUpInput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskReleaseUpInput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskSortOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskSortOutput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskSortOutput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskSortOutput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/ProductionSchedulingCrInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ProductionSchedulingCrInput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/ProductionSchedulingCrInput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ProductionSchedulingCrInput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/SwapMoldUpInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/SwapMoldUpInput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/SwapMoldUpInput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/SwapMoldUpInput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/TaskOperRecordOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/TaskOperRecordOutput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/TaskOperRecordOutput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/TaskOperRecordOutput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/TransferPlatformUpInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/TransferPlatformUpInput.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/TransferPlatformUpInput.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/TransferPlatformUpInput.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/Molds.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/Molds.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/Molds.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Entity/Molds.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/MoldsEntity.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/MoldsEntity.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/MoldsEntity.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Entity/MoldsEntity.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTask.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTask.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTask.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTask.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTaskLog.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTaskLog.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTaskLog.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTaskLog.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Mapper/Mapper.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Mapper/Mapper.cs similarity index 100% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Mapper/Mapper.cs rename to ProductionMgr/Tnb.ProductionMgr.Entities/Mapper/Mapper.cs diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entities.csproj b/ProductionMgr/Tnb.ProductionMgr.Entities/Tnb.ProductionMgr.Entities.csproj similarity index 84% rename from ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entities.csproj rename to ProductionMgr/Tnb.ProductionMgr.Entities/Tnb.ProductionMgr.Entities.csproj index a13ba3ff..1e177c15 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entities.csproj +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Tnb.ProductionMgr.Entities.csproj @@ -5,7 +5,7 @@ net6.0 enable enable - True + False diff --git a/ProductionMgr/Tnb.ProductionMgr.Interfaces/Tnb.ProductionMgr.Interfaces.csproj b/ProductionMgr/Tnb.ProductionMgr.Interfaces/Tnb.ProductionMgr.Interfaces.csproj index 2c116362..8a11db50 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Interfaces/Tnb.ProductionMgr.Interfaces.csproj +++ b/ProductionMgr/Tnb.ProductionMgr.Interfaces/Tnb.ProductionMgr.Interfaces.csproj @@ -1,15 +1,15 @@ - + net6.0 enable enable - True + False - + diff --git a/Tnb.Server.sln b/Tnb.Server.sln index 9cb956b4..04e28095 100644 --- a/Tnb.Server.sln +++ b/Tnb.Server.sln @@ -123,11 +123,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData.Interfaces", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.ProductionMgr", "ProductionMgr\Tnb.ProductionMgr\Tnb.ProductionMgr.csproj", "{C9001973-83C5-48B8-8905-69BCC8132928}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.ProductionMgr.Entities", "ProductionMgr\Tnb.ProductionMgr.Entitys\Tnb.ProductionMgr.Entities.csproj", "{4F4EDC3F-4167-4061-AD07-4B0254977F26}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.ProductionMgr.Interfaces", "ProductionMgr\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj", "{CE039C17-0037-457C-A202-486701DB7F17}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData.Entities", "BasicData\Tnb.BasicData.Entitys\Tnb.BasicData.Entities.csproj", "{96E5FF02-E67E-4578-B334-2FC9F6A5AA08}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData.Entities", "BasicData\Tnb.BasicData.Entities\Tnb.BasicData.Entities.csproj", "{03835631-26A5-442B-9B25-7F81D0A5594A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.ProductionMgr.Entities", "ProductionMgr\Tnb.ProductionMgr.Entities\Tnb.ProductionMgr.Entities.csproj", "{57E7491F-7876-451E-BA9F-5B007EBD432D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -303,18 +303,18 @@ Global {C9001973-83C5-48B8-8905-69BCC8132928}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9001973-83C5-48B8-8905-69BCC8132928}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9001973-83C5-48B8-8905-69BCC8132928}.Release|Any CPU.Build.0 = Release|Any CPU - {4F4EDC3F-4167-4061-AD07-4B0254977F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F4EDC3F-4167-4061-AD07-4B0254977F26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F4EDC3F-4167-4061-AD07-4B0254977F26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F4EDC3F-4167-4061-AD07-4B0254977F26}.Release|Any CPU.Build.0 = Release|Any CPU {CE039C17-0037-457C-A202-486701DB7F17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CE039C17-0037-457C-A202-486701DB7F17}.Debug|Any CPU.Build.0 = Debug|Any CPU {CE039C17-0037-457C-A202-486701DB7F17}.Release|Any CPU.ActiveCfg = Release|Any CPU {CE039C17-0037-457C-A202-486701DB7F17}.Release|Any CPU.Build.0 = Release|Any CPU - {96E5FF02-E67E-4578-B334-2FC9F6A5AA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96E5FF02-E67E-4578-B334-2FC9F6A5AA08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96E5FF02-E67E-4578-B334-2FC9F6A5AA08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96E5FF02-E67E-4578-B334-2FC9F6A5AA08}.Release|Any CPU.Build.0 = Release|Any CPU + {03835631-26A5-442B-9B25-7F81D0A5594A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03835631-26A5-442B-9B25-7F81D0A5594A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03835631-26A5-442B-9B25-7F81D0A5594A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03835631-26A5-442B-9B25-7F81D0A5594A}.Release|Any CPU.Build.0 = Release|Any CPU + {57E7491F-7876-451E-BA9F-5B007EBD432D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57E7491F-7876-451E-BA9F-5B007EBD432D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57E7491F-7876-451E-BA9F-5B007EBD432D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57E7491F-7876-451E-BA9F-5B007EBD432D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -361,9 +361,9 @@ Global {58343F2F-E846-4CBD-8BA5-50EE3088E89D} = {52B19E13-6B04-444C-A38A-B9955B199A98} {3F1EB6A2-BDC3-4F86-896E-786EAEE91D0B} = {52B19E13-6B04-444C-A38A-B9955B199A98} {C9001973-83C5-48B8-8905-69BCC8132928} = {ABE58B5E-610B-4159-BFF0-8B04BF700B3C} - {4F4EDC3F-4167-4061-AD07-4B0254977F26} = {ABE58B5E-610B-4159-BFF0-8B04BF700B3C} {CE039C17-0037-457C-A202-486701DB7F17} = {ABE58B5E-610B-4159-BFF0-8B04BF700B3C} - {96E5FF02-E67E-4578-B334-2FC9F6A5AA08} = {52B19E13-6B04-444C-A38A-B9955B199A98} + {03835631-26A5-442B-9B25-7F81D0A5594A} = {52B19E13-6B04-444C-A38A-B9955B199A98} + {57E7491F-7876-451E-BA9F-5B007EBD432D} = {ABE58B5E-610B-4159-BFF0-8B04BF700B3C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {646DDD1C-F143-42C2-894F-F5C7B3A0CE74} From c9e0e2691b1ba2e85c7542df1274eb552b9cc759 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Sat, 6 May 2023 17:09:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AD=90=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/BasMaterial/MaterialSelectOutput.cs | 38 +++++++++++++ .../BasMaterial/MaterialSelectQueryInput.cs | 25 +++++++++ .../IBasMaterialService.cs | 4 +- BasicData/Tnb.BasicData/BasMaterialService.cs | 55 +++++++++++++++++++ 4 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs create mode 100644 BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs new file mode 100644 index 00000000..76ee9199 --- /dev/null +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs @@ -0,0 +1,38 @@ +namespace Tnb.BasicData.Entities.Dto +{ + /// + /// 物料弹窗选择显示信息 + /// + public class MaterialSelectOutput + { + /// + /// 物料id + /// + public string id { get; set; } + + /// + /// 编码 + /// + public string code { get; set; } + + /// + /// 名称 + /// + public string name { get; set; } + + /// + /// 描述 + /// + public string descrip { get; set; } + + /// + /// 主单位id + /// + public string unit_id { get; set; } + + /// + /// 主单位名称 + /// + public string unit_name { get; set; } + } +} \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs new file mode 100644 index 00000000..4ca42123 --- /dev/null +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs @@ -0,0 +1,25 @@ +namespace Tnb.BasicData.Entities.Dto +{ + public class MaterialSelectQueryInput + { + /// + /// 物料清单id + /// + public string ebom_id { get; set; } + + /// + /// 物料编码名称查询 + /// + public string material_info { get; set; } + + /// + /// 当前页码:pageIndex. + /// + public virtual int currentPage { get; set; } = 1; + + /// + /// 每页行数. + /// + public virtual int pageSize { get; set; } = 50; + } +} \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs index 3fce3259..c27b3596 100644 --- a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs +++ b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs @@ -1,7 +1,9 @@ +using Tnb.BasicData.Entities.Dto; + namespace Tnb.BasicData.Interfaces { public interface IBasMaterialService { - + public Task GetMaterialSelectInfo(MaterialSelectQueryInput queryInput); } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs index c382baab..35a78ab4 100644 --- a/BasicData/Tnb.BasicData/BasMaterialService.cs +++ b/BasicData/Tnb.BasicData/BasMaterialService.cs @@ -1,11 +1,14 @@ using JNPF.Common.Core.Manager; +using JNPF.Common.Filter; using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; +using JNPF.Systems.Entitys.System; using JNPF.Systems.Interfaces.System; using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entities; +using Tnb.BasicData.Entities.Dto; using Tnb.BasicData.Interfaces; namespace Tnb.BasicData @@ -60,5 +63,57 @@ namespace Tnb.BasicData return result.IsSuccess ? "复制成功" : result.ErrorMessage; } + + /// + /// 获取物料清单所有自己物料信息 + /// + /// + /// + [HttpPost] + public async Task GetMaterialSelectInfo(MaterialSelectQueryInput queryInput) + { + var db = _repository.AsSugarClient(); + List ids = await GetAllChildrenMaterialId(queryInput.ebom_id); + var result = await db.Queryable() + .LeftJoin((a, b) => a.unit_id == b.EnCode) + .LeftJoin((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null) + .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info)) + .WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id)) + .Select((a, b, c) => new MaterialSelectOutput() + { + id = a.id, + code = a.code, + name = a.name, + descrip = a.descrip, + unit_id = a.unit_id, + unit_name = b.FullName, + }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize); + + return PageResult.SqlSugarPageResult(result); + } + + /// + /// 获取物料清单下所子集物料id + /// + /// + private async Task> GetAllChildrenMaterialId(string ebomId) + { + if (string.IsNullOrEmpty(ebomId)) return new List(); + List ids = new List(); + var list = await _repository.AsSugarClient().Queryable().Where(x => x.ebom_id == ebomId) + .Select(x => x.material_id).ToListAsync(); + if (list != null && list.Count > 0) + { + foreach (var id in list) + { + //获取最新创建的物料清单 + var ebom = await _repository.AsSugarClient().Queryable().Where(x=>x.material_id==id).OrderByDescending(x=>x.create_time).FirstAsync(); + ids.AddRange(await GetAllChildrenMaterialId(ebom?.id)); + } + ids.AddRange(list); + } + + return ids; + } } } \ No newline at end of file