|
@@ -540,6 +540,9 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <exception cref="NotImplementedException"></exception>
|
|
/// <exception cref="NotImplementedException"></exception>
|
|
|
public async Task<string> ReceiveResult(ResourceCheckInputDto input)
|
|
public async Task<string> ReceiveResult(ResourceCheckInputDto input)
|
|
|
{
|
|
{
|
|
|
|
|
+ var aa = GetProductStructure(new List<string> { "1.SD1.D.0056-F", "1.SD1.D.0059" });
|
|
|
|
|
+ return "OK";
|
|
|
|
|
+
|
|
|
//资源检查入参全局变量赋值
|
|
//资源检查入参全局变量赋值
|
|
|
param.tenantId = input.tenantId;
|
|
param.tenantId = input.tenantId;
|
|
|
param.factoryId = input.factoryId;
|
|
param.factoryId = input.factoryId;
|
|
@@ -2384,11 +2387,12 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <summary>
|
|
/// <summary>
|
|
|
/// 生产排产
|
|
/// 生产排产
|
|
|
/// </summary>
|
|
/// </summary>
|
|
|
- /// <param name="workOrds"></param>
|
|
|
|
|
|
|
+ /// <param name="workOrd"></param>
|
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
|
/// <exception cref="NotImplementedException"></exception>
|
|
/// <exception cref="NotImplementedException"></exception>
|
|
|
- public async Task<string> ProductionSchedule(List<string> workOrds)
|
|
|
|
|
|
|
+ public async Task<string> ProductionSchedule(string workOrd)
|
|
|
{
|
|
{
|
|
|
|
|
+ List<string> workOrds = workOrd.Split(",").ToList();
|
|
|
if (workOrds.Count() == 0)
|
|
if (workOrds.Count() == 0)
|
|
|
{
|
|
{
|
|
|
return "";
|
|
return "";
|
|
@@ -2527,14 +2531,12 @@ namespace Business.ResourceExamineManagement
|
|
|
//非虚拟件
|
|
//非虚拟件
|
|
|
var notPhantoms = chdStructures.Where(p => p.StructureType.ToUpper() != "X").ToList();
|
|
var notPhantoms = chdStructures.Where(p => p.StructureType.ToUpper() != "X").ToList();
|
|
|
//存在非虚拟件
|
|
//存在非虚拟件
|
|
|
- if (notPhantoms.Count() > 0)
|
|
|
|
|
|
|
+ foreach (var item in notPhantoms)
|
|
|
{
|
|
{
|
|
|
- notPhantoms.ForEach(p =>
|
|
|
|
|
- {
|
|
|
|
|
- p.ParentItem = parentItem;
|
|
|
|
|
- });
|
|
|
|
|
- rtnStructures.AddRange(notPhantoms);
|
|
|
|
|
|
|
+ item.ParentItem = parentItem;
|
|
|
}
|
|
}
|
|
|
|
|
+ rtnStructures.AddRange(notPhantoms);
|
|
|
|
|
+
|
|
|
//虚拟件
|
|
//虚拟件
|
|
|
var phantoms = chdStructures.Where(p => p.StructureType.ToUpper() == "X").ToList();
|
|
var phantoms = chdStructures.Where(p => p.StructureType.ToUpper() == "X").ToList();
|
|
|
if (phantoms.Count() > 0)
|
|
if (phantoms.Count() > 0)
|