|
|
@@ -39,6 +39,7 @@ using Spire.Pdf.Exporting.XPS.Schema;
|
|
|
using Business.PriorityManagement;
|
|
|
using Newtonsoft.Json.Linq;
|
|
|
using Business.Dto;
|
|
|
+using NetTopologySuite.Simplify;
|
|
|
|
|
|
namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
@@ -2230,6 +2231,10 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
|
//获取工单数据
|
|
|
var workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd));
|
|
|
+ //获取已排产的工单
|
|
|
+ List<string> dbWorkOrds = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds)).Select(p => p.WorkOrds).Distinct().ToList();
|
|
|
+ //过滤掉已排产的工单
|
|
|
+ workOrdMasters = workOrdMasters.Where(p => !dbWorkOrds.Contains(p.WorkOrd)).ToList();
|
|
|
//排产
|
|
|
await _productionScheduleAppService.DoProductShcedule(workOrdMasters);
|
|
|
return JsonConvert.SerializeObject("ok");
|