|
|
@@ -1179,7 +1179,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <param name="bomchildlist"></param>
|
|
|
public void GetIcBomData(List<mo_ic_bom> icBoms, List<mo_ic_bom> bomlist, List<mo_ic_bom_child> bomchildlist)
|
|
|
{
|
|
|
- if (icBoms.Count() == 0)
|
|
|
+ if (icBoms.Count == 0)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
@@ -1598,7 +1598,7 @@ namespace Business.ResourceExamineManagement
|
|
|
srm_Po_Occupy.type = MorderEnum.Zyjc_Type;//TODO:类型未知
|
|
|
srm_Po_Occupy.stime = detail[0].create_time;
|
|
|
srm_Po_Occupy.etime = detail[0].rarrdate;
|
|
|
- pomain.po_total = pomain.po_total + item.pr_orderprice;
|
|
|
+ pomain.po_total += item.pr_orderprice;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -1640,7 +1640,7 @@ namespace Business.ResourceExamineManagement
|
|
|
srm_Po_Occupy.stime = podetail.create_time;
|
|
|
srm_Po_Occupy.etime = podetail.rarrdate;
|
|
|
|
|
|
- pomain.po_total = pomain.po_total + item.pr_orderprice;
|
|
|
+ pomain.po_total += item.pr_orderprice;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -1792,7 +1792,7 @@ namespace Business.ResourceExamineManagement
|
|
|
public async Task<string> PlanOrderResourceCheck(string workOrd)
|
|
|
{
|
|
|
List<string> workOrds = workOrd.Split(",").ToList();
|
|
|
- if (workOrds.Count() == 0)
|
|
|
+ if (workOrds.Count == 0)
|
|
|
{
|
|
|
return "";
|
|
|
}
|
|
|
@@ -1819,7 +1819,7 @@ namespace Business.ResourceExamineManagement
|
|
|
if (day == 0)
|
|
|
{
|
|
|
List<string> workOrds = workOrd.Split(",").ToList();
|
|
|
- if (workOrds.Count() == 0)
|
|
|
+ if (workOrds.Count == 0)
|
|
|
{
|
|
|
return "";
|
|
|
}
|
|
|
@@ -1915,7 +1915,7 @@ namespace Business.ResourceExamineManagement
|
|
|
if (day == 0)
|
|
|
{
|
|
|
List<string> workOrds = workOrd.Split(",").ToList();
|
|
|
- if (workOrds.Count() == 0)
|
|
|
+ if (workOrds.Count == 0)
|
|
|
{
|
|
|
return "";
|
|
|
}
|
|
|
@@ -2499,11 +2499,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/// </summary>
|
|
|
public void AutoCreateBomBill(List<mo_ic_bom> ic_Boms = null)
|
|
|
{
|
|
|
- if (ic_Boms == null)
|
|
|
- {
|
|
|
- ic_Boms = _ic_bom.Find(p => p.factory_id == 10101 && p.tenant_id == 101 && !p.IsDeleted).Result.ToList();
|
|
|
- }
|
|
|
-
|
|
|
+ ic_Boms ??= _ic_bom.Find(p => p.factory_id == 10101 && p.tenant_id == 101 && !p.IsDeleted).Result.ToList();
|
|
|
var pretreatment = _mysql_b_bom_pretreatment.GetListAsync(s => ic_Boms.Select(c => c.mysql_id).ToList().Contains(s.sourceid)).Result;
|
|
|
|
|
|
//物料bom
|
|
|
@@ -2686,7 +2682,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
if (a.ItemNum == b.ItemNum && a.Location == b.LocationFrom && a.QtyOnHand - dictItemQty[a.ItemNum] > 0)
|
|
|
{
|
|
|
- a.QtyOnHand = a.QtyOnHand - dictItemQty[a.ItemNum];
|
|
|
+ a.QtyOnHand -= dictItemQty[a.ItemNum];
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
@@ -2820,7 +2816,7 @@ namespace Business.ResourceExamineManagement
|
|
|
public async Task<string> ProductionSchedule(string workOrd)
|
|
|
{
|
|
|
List<string> workOrds = workOrd.Split(",").ToList();
|
|
|
- if (workOrds.Count() == 0)
|
|
|
+ if (workOrds.Count == 0)
|
|
|
{
|
|
|
return "";
|
|
|
}
|
|
|
@@ -2830,7 +2826,7 @@ namespace Business.ResourceExamineManagement
|
|
|
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();
|
|
|
- if (workOrdMasters.Count() == 0)
|
|
|
+ if (workOrdMasters.Count == 0)
|
|
|
{
|
|
|
return JsonConvert.SerializeObject("ok");
|
|
|
}
|
|
|
@@ -2855,13 +2851,13 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
|
else {
|
|
|
workOrds = workOrd.Split(",").ToList();
|
|
|
- if (workOrds.Count() == 0)
|
|
|
+ if (workOrds.Count == 0)
|
|
|
{
|
|
|
return JsonConvert.SerializeObject("没有需要下达的工单。");
|
|
|
}
|
|
|
workOrdMasters = _workOrdMaster.Select(p => workOrds.Contains(p.WorkOrd) && p.Status != "r" && p.Status != "c");
|
|
|
}
|
|
|
- if (workOrdMasters.Count() == 0)
|
|
|
+ if (workOrdMasters.Count == 0)
|
|
|
{
|
|
|
return "没有需要下达的工单。";
|
|
|
}
|
|
|
@@ -2875,7 +2871,7 @@ namespace Business.ResourceExamineManagement
|
|
|
var nbrList = _nbrMaster.Select(a => a.Domain == "1001" && a.Type == "SM" && dbWorkOrds.Contains(a.WorkOrd));
|
|
|
var noNbrlist = nbrList.Select(p => p.WorkOrd).ToList();
|
|
|
workOrdMasters = workOrdMasters.Where(p => !noNbrlist.Contains(p.WorkOrd)).ToList();
|
|
|
- if (workOrdMasters.Count() == 0)
|
|
|
+ if (workOrdMasters.Count == 0)
|
|
|
{
|
|
|
return "当前选择的工单已领料或未排产。";
|
|
|
}
|
|
|
@@ -3022,7 +3018,7 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
//获取当前产品的虚拟件
|
|
|
var curPhantoms = productStructures.Where(p => p.StructureType.ToUpper() == "X").ToList();
|
|
|
- if (curPhantoms.Count() == 0)
|
|
|
+ if (curPhantoms.Count == 0)
|
|
|
{
|
|
|
return rtnStructures;
|
|
|
}
|
|
|
@@ -3053,7 +3049,7 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
//虚拟件
|
|
|
var phantoms = chdStructures.Where(p => p.StructureType.ToUpper() == "X").ToList();
|
|
|
- if (phantoms.Count() > 0)
|
|
|
+ if (phantoms.Count > 0)
|
|
|
{
|
|
|
//递归
|
|
|
RecursionProductStructure(parentItem, phantoms, rtnStructures);
|
|
|
@@ -3079,7 +3075,7 @@ namespace Business.ResourceExamineManagement
|
|
|
_productExamineAppService.qualityLineWorks = qualityLineWorks;
|
|
|
_productExamineAppService.holidays = holidays;
|
|
|
_productExamineAppService.periodSequences = periodSequences;
|
|
|
- if (sentrys.Count() == 0)
|
|
|
+ if (sentrys.Count == 0)
|
|
|
{
|
|
|
return;
|
|
|
}
|