From 33b25811de3b0e257069b71fd3897ef37a688d63 Mon Sep 17 00:00:00 2001 From: gcw_MV9p2JJN Date: Sat, 10 Jan 2026 16:54:13 +0800 Subject: [PATCH] 1 --- MDM/Controllers/Plant/PlantWorkshopController.cs | 2 +- MDM/Controllers/Process/ProcessOperationController.cs | 2 +- MDM/Services/Plant/IService/IPlantProductlinebodyService.cs | 6 +++--- MDM/Services/Plant/IService/IPlantWorkshopService.cs | 2 +- MDM/Services/Plant/IService/IPlantWorkstationService.cs | 6 +++--- MDM/Services/Plant/PlantProductlinebodyService.cs | 4 ++-- MDM/Services/Plant/PlantWorkshopService.cs | 2 +- MDM/Services/Plant/PlantWorkstationService.cs | 6 +++--- MDM/Services/Process/IService/IProcessOperationService.cs | 2 +- MDM/Services/Process/ProcessOperationService.cs | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MDM/Controllers/Plant/PlantWorkshopController.cs b/MDM/Controllers/Plant/PlantWorkshopController.cs index 799cd45..9065b2b 100644 --- a/MDM/Controllers/Plant/PlantWorkshopController.cs +++ b/MDM/Controllers/Plant/PlantWorkshopController.cs @@ -116,7 +116,7 @@ namespace MDM.Controllers.Plant /// 工厂code /// [HttpGet("get_factory_site")] - public IActionResult GetFactorySite(string site_code) + public IActionResult GetFactorySite(string? site_code) { var response = _PlantWorkshopService.GetFactorySite(site_code); diff --git a/MDM/Controllers/Process/ProcessOperationController.cs b/MDM/Controllers/Process/ProcessOperationController.cs index cac7512..0c350e2 100644 --- a/MDM/Controllers/Process/ProcessOperationController.cs +++ b/MDM/Controllers/Process/ProcessOperationController.cs @@ -157,7 +157,7 @@ namespace MDM.Controllers.Process //TODO 获取并筛选流程 [HttpGet("get_flow")] - public IActionResult GetFlow(string flow_type_code) + public IActionResult GetFlow(string? flow_type_code) { var response = _ProcessOperationService.GetFlow(flow_type_code); return SUCCESS(response); diff --git a/MDM/Services/Plant/IService/IPlantProductlinebodyService.cs b/MDM/Services/Plant/IService/IPlantProductlinebodyService.cs index 11f3750..7fd1d7c 100644 --- a/MDM/Services/Plant/IService/IPlantProductlinebodyService.cs +++ b/MDM/Services/Plant/IService/IPlantProductlinebodyService.cs @@ -19,10 +19,10 @@ namespace MDM.Services.IPlantService int UpdatePlantProductlinebody(PlantProductlinebody parm); - List GetWorkstationList(int id); - List GetFactorySite(string site_code); + List GetWorkstationList(int id); + List GetFactorySite(string? site_code); - List GetWorkShop(string site_code,string workshop_code); + List GetWorkShop(string? site_code, string? workshop_code); } } diff --git a/MDM/Services/Plant/IService/IPlantWorkshopService.cs b/MDM/Services/Plant/IService/IPlantWorkshopService.cs index 4bd2d0d..eb0b5f8 100644 --- a/MDM/Services/Plant/IService/IPlantWorkshopService.cs +++ b/MDM/Services/Plant/IService/IPlantWorkshopService.cs @@ -19,7 +19,7 @@ namespace MDM.Services.IPlantService int UpdatePlantWorkshop(PlantWorkshop parm); - List GetFactorySite(string site_code); + List GetFactorySite(string? site_code); } } diff --git a/MDM/Services/Plant/IService/IPlantWorkstationService.cs b/MDM/Services/Plant/IService/IPlantWorkstationService.cs index c86b8b4..c21a3d9 100644 --- a/MDM/Services/Plant/IService/IPlantWorkstationService.cs +++ b/MDM/Services/Plant/IService/IPlantWorkstationService.cs @@ -20,11 +20,11 @@ namespace MDM.Services.IPlantService int UpdatePlantWorkstation(PlantWorkstation parm); - List GetFactorySite(string site_code); + List GetFactorySite(string? site_code); - List GetWorkShop(string site_code, string workshop_code); + List GetWorkShop(string? site_code, string? workshop_code); - List GetPlantProductlinebodies(string site_code, string workshop_code, string linecode); + List GetPlantProductlinebodies(string? site_code, string? workshop_code, string? linecode); } } diff --git a/MDM/Services/Plant/PlantProductlinebodyService.cs b/MDM/Services/Plant/PlantProductlinebodyService.cs index 3d10b80..335b71b 100644 --- a/MDM/Services/Plant/PlantProductlinebodyService.cs +++ b/MDM/Services/Plant/PlantProductlinebodyService.cs @@ -94,13 +94,13 @@ namespace MDM.Services.Plant return Context.Queryable().Where(it => it.FkFactorySiteCode == productlinebody.FkFactorySiteCode && it.FkWorkshopCode == productlinebody.FkWorkshopCode && it.FkProductlinebody == productlinebody.LineCode).ToList(); } - public List GetFactorySite(string site_code) + public List GetFactorySite(string? site_code) { return Context.Queryable().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList(); } - public List GetWorkShop(string site_code, string workshop_code) + public List GetWorkShop(string? site_code, string? workshop_code) { return Context.Queryable() .WhereIF(!string.IsNullOrEmpty(site_code), it => it.FkSiteCode.Contains(site_code)) diff --git a/MDM/Services/Plant/PlantWorkshopService.cs b/MDM/Services/Plant/PlantWorkshopService.cs index 799e2a7..cc3c6e3 100644 --- a/MDM/Services/Plant/PlantWorkshopService.cs +++ b/MDM/Services/Plant/PlantWorkshopService.cs @@ -88,7 +88,7 @@ namespace MDM.Services.Plant } - public List GetFactorySite(string site_code) + public List GetFactorySite(string? site_code) { return Context.Queryable().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList(); } diff --git a/MDM/Services/Plant/PlantWorkstationService.cs b/MDM/Services/Plant/PlantWorkstationService.cs index 96d6e1a..a1bfdf6 100644 --- a/MDM/Services/Plant/PlantWorkstationService.cs +++ b/MDM/Services/Plant/PlantWorkstationService.cs @@ -97,19 +97,19 @@ namespace MDM.Services.Plant } - public List GetFactorySite(string site_code) + public List GetFactorySite(string? site_code) { return Context.Queryable().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList(); } - public List GetWorkShop(string site_code, string workshop_code) + public List GetWorkShop(string? site_code, string? workshop_code) { return Context.Queryable() .WhereIF(!string.IsNullOrEmpty(site_code), it => it.FkSiteCode.Contains(site_code)) .WhereIF(!string.IsNullOrEmpty(workshop_code), it => it.WorkshopCode.Contains(workshop_code)) .ToList(); } - public List GetPlantProductlinebodies(string site_code, string workshop_code, string linecode) + public List GetPlantProductlinebodies(string? site_code, string? workshop_code, string? linecode) { return Context.Queryable() .WhereIF(!string.IsNullOrEmpty(site_code), it => it.FkFactorySiteCode.Contains(site_code)) diff --git a/MDM/Services/Process/IService/IProcessOperationService.cs b/MDM/Services/Process/IService/IProcessOperationService.cs index 9ad13f8..874b0f4 100644 --- a/MDM/Services/Process/IService/IProcessOperationService.cs +++ b/MDM/Services/Process/IService/IProcessOperationService.cs @@ -32,7 +32,7 @@ namespace MDM.Services.IProcessService List QueryProcessOprerationTransitionDict(ProcessOprerationTransitionDictQueryDto parm); - List GetFlow(string flow_type_code); + List GetFlow(string? flow_type_code); int BindFlow(ProcessOperationBindFlowDto parm); diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs index a2cd7eb..682632c 100644 --- a/MDM/Services/Process/ProcessOperationService.cs +++ b/MDM/Services/Process/ProcessOperationService.cs @@ -203,7 +203,7 @@ namespace MDM.Services.Process return response; } - public List GetFlow(string flow_type_code) + public List GetFlow(string? flow_type_code) { var response = Context.Queryable() .WhereIF(!string.IsNullOrEmpty(flow_type_code), m => m.FlowTypeCode.Contains(flow_type_code))