|
|
@@ -662,7 +662,7 @@ public class BizLotController extends BaseController {
|
|
|
updateItem.setProdNum(l.getLotNumber());
|
|
|
updateItem.setQualifiedNum(l.getQualifiedNum());
|
|
|
bizDayworkItems.add(updateItem);
|
|
|
- delDayworkItems.addAll(currentItems.stream().filter(e -> currentItems.stream().noneMatch(t -> t.getId().equals(e.getId()))).collect(Collectors.toList()));
|
|
|
+ delDayworkItems.addAll(currentItems.stream().filter(e -> bizDayworkItems.stream().noneMatch(t -> t.getId().equals(e.getId()))).collect(Collectors.toList()));
|
|
|
}
|
|
|
List<BizDayworkItem> historyDayworkItem = baseDayworkItems.stream().filter(e -> e.getDayworkId().equals(baseDayworks.get(0).getId())).filter(e -> bizDayworkItems.stream().noneMatch(t -> t.getId().equals(e.getId()))).filter(e -> delDayworkItems.stream().noneMatch(t -> t.getId().equals(e.getId()))).collect(Collectors.toList());
|
|
|
historyDayworkItem.forEach(v -> {
|
