|
@@ -758,7 +758,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
// 父子ID对应关系处理
|
|
|
List<String> processIdss = new ArrayList<>();
|
|
|
// 坯料计划订单
|
|
|
- ProduceOrder produceOrder = new ProduceOrder(apsBlankOrderVo.getId(), apsBlankOrderVo.getMaterialname(), DateUtil.offsetHour(apsBlankOrderVo.getDeliverydate(), -apsBlankOrderVo.getDeliverytime()));
|
|
|
+ ProduceOrder produceOrder = new ProduceOrder(apsBlankOrderVo.getId(), apsBlankOrderVo.getMaterialname(), apsBlankOrderVo.getDeliverydate() == null ? null : DateUtil.offsetHour(apsBlankOrderVo.getDeliverydate(), -apsBlankOrderVo.getDeliverytime()));
|
|
|
produceOrder.setMaxheatroll(apsBlankOrderVo.getMaxheatroll());
|
|
|
// 获取所有订单工序
|
|
|
List<ApsProcessOperationDo> operationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
|