|
|
|
|
@ -631,8 +631,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
LambdaQueryWrapper<EquipResourceEntity> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.eq(EquipResourceEntity::getCraftId, craft.getCaId()) |
|
|
|
|
.eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId()) |
|
|
|
|
.ge(EquipResourceEntity::getStartTime, dateTime) |
|
|
|
|
.eq(EquipResourceEntity::getIsUsed, 0) |
|
|
|
|
.ge(EquipResourceEntity::getStartTime, dateTime) |
|
|
|
|
.in(EquipResourceEntity::getEquipOrder, entry.getKey()); |
|
|
|
|
//返工订单需要原班组加工
|
|
|
|
|
if(StringUtils.isNotEmpty(order.getReworkCode())){ |
|
|
|
|
|