1
This commit is contained in:
parent
d55dcbc913
commit
33b25811de
@ -116,7 +116,7 @@ namespace MDM.Controllers.Plant
|
||||
/// <param name="site_code">工厂code</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("get_factory_site")]
|
||||
public IActionResult GetFactorySite(string site_code)
|
||||
public IActionResult GetFactorySite(string? site_code)
|
||||
{
|
||||
var response = _PlantWorkshopService.GetFactorySite(site_code);
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -19,10 +19,10 @@ namespace MDM.Services.IPlantService
|
||||
|
||||
int UpdatePlantProductlinebody(PlantProductlinebody parm);
|
||||
|
||||
List<PlantWorkstation> GetWorkstationList(int id);
|
||||
List<PlantFactorySite> GetFactorySite(string site_code);
|
||||
List<PlantWorkstation> GetWorkstationList(int id);
|
||||
List<PlantFactorySite> GetFactorySite(string? site_code);
|
||||
|
||||
List<PlantWorkshop> GetWorkShop(string site_code,string workshop_code);
|
||||
List<PlantWorkshop> GetWorkShop(string? site_code, string? workshop_code);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ namespace MDM.Services.IPlantService
|
||||
|
||||
int UpdatePlantWorkshop(PlantWorkshop parm);
|
||||
|
||||
List<PlantFactorySite> GetFactorySite(string site_code);
|
||||
List<PlantFactorySite> GetFactorySite(string? site_code);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,11 +20,11 @@ namespace MDM.Services.IPlantService
|
||||
|
||||
int UpdatePlantWorkstation(PlantWorkstation parm);
|
||||
|
||||
List<PlantFactorySite> GetFactorySite(string site_code);
|
||||
List<PlantFactorySite> GetFactorySite(string? site_code);
|
||||
|
||||
List<PlantWorkshop> GetWorkShop(string site_code, string workshop_code);
|
||||
List<PlantWorkshop> GetWorkShop(string? site_code, string? workshop_code);
|
||||
|
||||
List<PlantProductlinebody> GetPlantProductlinebodies(string site_code, string workshop_code, string linecode);
|
||||
List<PlantProductlinebody> GetPlantProductlinebodies(string? site_code, string? workshop_code, string? linecode);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -94,13 +94,13 @@ namespace MDM.Services.Plant
|
||||
|
||||
return Context.Queryable<PlantWorkstation>().Where(it => it.FkFactorySiteCode == productlinebody.FkFactorySiteCode && it.FkWorkshopCode == productlinebody.FkWorkshopCode && it.FkProductlinebody == productlinebody.LineCode).ToList();
|
||||
}
|
||||
public List<PlantFactorySite> GetFactorySite(string site_code)
|
||||
public List<PlantFactorySite> GetFactorySite(string? site_code)
|
||||
{
|
||||
return Context.Queryable<PlantFactorySite>().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList();
|
||||
}
|
||||
|
||||
|
||||
public List<PlantWorkshop> GetWorkShop(string site_code, string workshop_code)
|
||||
public List<PlantWorkshop> GetWorkShop(string? site_code, string? workshop_code)
|
||||
{
|
||||
return Context.Queryable<PlantWorkshop>()
|
||||
.WhereIF(!string.IsNullOrEmpty(site_code), it => it.FkSiteCode.Contains(site_code))
|
||||
|
||||
@ -88,7 +88,7 @@ namespace MDM.Services.Plant
|
||||
}
|
||||
|
||||
|
||||
public List<PlantFactorySite> GetFactorySite(string site_code)
|
||||
public List<PlantFactorySite> GetFactorySite(string? site_code)
|
||||
{
|
||||
return Context.Queryable<PlantFactorySite>().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList();
|
||||
}
|
||||
|
||||
@ -97,19 +97,19 @@ namespace MDM.Services.Plant
|
||||
}
|
||||
|
||||
|
||||
public List<PlantFactorySite> GetFactorySite(string site_code)
|
||||
public List<PlantFactorySite> GetFactorySite(string? site_code)
|
||||
{
|
||||
return Context.Queryable<PlantFactorySite>().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList();
|
||||
}
|
||||
|
||||
public List<PlantWorkshop> GetWorkShop(string site_code, string workshop_code)
|
||||
public List<PlantWorkshop> GetWorkShop(string? site_code, string? workshop_code)
|
||||
{
|
||||
return Context.Queryable<PlantWorkshop>()
|
||||
.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<PlantProductlinebody> GetPlantProductlinebodies(string site_code, string workshop_code, string linecode)
|
||||
public List<PlantProductlinebody> GetPlantProductlinebodies(string? site_code, string? workshop_code, string? linecode)
|
||||
{
|
||||
return Context.Queryable<PlantProductlinebody>()
|
||||
.WhereIF(!string.IsNullOrEmpty(site_code), it => it.FkFactorySiteCode.Contains(site_code))
|
||||
|
||||
@ -32,7 +32,7 @@ namespace MDM.Services.IProcessService
|
||||
|
||||
List<ProcessOprerationTransitionDict> QueryProcessOprerationTransitionDict(ProcessOprerationTransitionDictQueryDto parm);
|
||||
|
||||
List<ProcessFlowList> GetFlow(string flow_type_code);
|
||||
List<ProcessFlowList> GetFlow(string? flow_type_code);
|
||||
|
||||
int BindFlow(ProcessOperationBindFlowDto parm);
|
||||
|
||||
|
||||
@ -203,7 +203,7 @@ namespace MDM.Services.Process
|
||||
return response;
|
||||
}
|
||||
|
||||
public List<ProcessFlowList> GetFlow(string flow_type_code)
|
||||
public List<ProcessFlowList> GetFlow(string? flow_type_code)
|
||||
{
|
||||
var response = Context.Queryable<ProcessFlowList>()
|
||||
.WhereIF(!string.IsNullOrEmpty(flow_type_code), m => m.FlowTypeCode.Contains(flow_type_code))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user