|
@@ -3369,7 +3369,12 @@ namespace Business.ResourceExamineManagement
|
|
|
woDetail = new WorkOrdDetail();
|
|
woDetail = new WorkOrdDetail();
|
|
|
woDetail.Domain = workord.Domain;
|
|
woDetail.Domain = workord.Domain;
|
|
|
woDetail.WorkOrd = workord.WorkOrd;
|
|
woDetail.WorkOrd = workord.WorkOrd;
|
|
|
- woDetail.Op = caleList.Max(f => f.Op);
|
|
|
|
|
|
|
+ var oplist = caleList.Where(x => x.Op > 0).ToList();
|
|
|
|
|
+ woDetail.Op = 0;
|
|
|
|
|
+ if (oplist.Any())
|
|
|
|
|
+ {
|
|
|
|
|
+ woDetail.Op = oplist.Min(f => f.Op);
|
|
|
|
|
+ }
|
|
|
woDetail.ItemNum = caleNumber;
|
|
woDetail.ItemNum = caleNumber;
|
|
|
woDetail.QtyPosted = 0m;
|
|
woDetail.QtyPosted = 0m;
|
|
|
woDetail.QtyReturned = 0m;
|
|
woDetail.QtyReturned = 0m;
|
|
@@ -4277,7 +4282,12 @@ namespace Business.ResourceExamineManagement
|
|
|
woDetail = new WorkOrdDetail();
|
|
woDetail = new WorkOrdDetail();
|
|
|
woDetail.Domain = item.factory_id.ToString();
|
|
woDetail.Domain = item.factory_id.ToString();
|
|
|
woDetail.WorkOrd = item.morder_no;
|
|
woDetail.WorkOrd = item.morder_no;
|
|
|
- woDetail.Op = caleList.Max(f => f.Op);
|
|
|
|
|
|
|
+ var oplist = caleList.Where(x => x.Op > 0).ToList();
|
|
|
|
|
+ woDetail.Op = 0;
|
|
|
|
|
+ if (oplist.Any())
|
|
|
|
|
+ {
|
|
|
|
|
+ woDetail.Op = oplist.Min(f => f.Op);
|
|
|
|
|
+ }
|
|
|
woDetail.ItemNum = caleNumber;
|
|
woDetail.ItemNum = caleNumber;
|
|
|
woDetail.QtyPosted = 0m;
|
|
woDetail.QtyPosted = 0m;
|
|
|
woDetail.QtyReturned = 0m;
|
|
woDetail.QtyReturned = 0m;
|