|
|
@@ -2531,7 +2531,7 @@ namespace Business.ResourceExamineManagement
|
|
|
AutoCreateBomBill();
|
|
|
}
|
|
|
|
|
|
- public void AutoCreatePickBill(List<string> workOrds)
|
|
|
+ public async Task AutoCreatePickBill(List<string> workOrds)
|
|
|
{
|
|
|
//获取生产周期数据
|
|
|
List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds) && p.Domain == "1001" && p.IsActive);
|
|
|
@@ -2822,7 +2822,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/// 生成领料单
|
|
|
/// </summary>
|
|
|
/// <param name="workOrd"></param>
|
|
|
- public string CreatePickBill(string workOrd)
|
|
|
+ public async Task<string> CreatePickBill(string workOrd)
|
|
|
{
|
|
|
List<string> workOrds = new List<string>();
|
|
|
List<WorkOrdMaster> workOrdMasters = new List<WorkOrdMaster>();
|
|
|
@@ -2835,7 +2835,7 @@ namespace Business.ResourceExamineManagement
|
|
|
workOrds = workOrd.Split(",").ToList();
|
|
|
if (workOrds.Count() == 0)
|
|
|
{
|
|
|
- return "没有需要下达的工单。";
|
|
|
+ return JsonConvert.SerializeObject("没有需要下达的工单。");
|
|
|
}
|
|
|
workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd) && p.Status != "r" && p.Status != "c");
|
|
|
}
|
|
|
@@ -2855,9 +2855,9 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
return "当前选择的工单已领料或未排产。";
|
|
|
}
|
|
|
- AutoCreatePickBill(workOrdMasters.Select(p => p.WorkOrd).ToList());
|
|
|
+ await AutoCreatePickBill(workOrdMasters.Select(p => p.WorkOrd).ToList());
|
|
|
workOrdMasters.ForEach(p => { p.Status = "r"; });
|
|
|
- _workOrdMaster.Update(workOrdMasters);
|
|
|
+ _workOrdMaster.Update(workOrdMasters);
|
|
|
return "";
|
|
|
}
|
|
|
|