|
|
@ -308,12 +308,14 @@ public class OrderTimeHistServiceImpl extends ServiceImpl<OrderTimeHistDao, Orde |
|
|
// 校验工单数量是否结束 |
|
|
// 校验工单数量是否结束 |
|
|
if (totalOrderTimeHist.getQtyprd() == ifsShopOrderVo.getRevisedQtyDue()) { |
|
|
if (totalOrderTimeHist.getQtyprd() == ifsShopOrderVo.getRevisedQtyDue()) { |
|
|
// 获取该工序 最后一次生产时间 |
|
|
// 获取该工序 最后一次生产时间 |
|
|
|
|
|
orderTimeHistQuery.setEventtype("F"); |
|
|
OrderTimeHistEntity lastOrderTimeHistInfo = getLastOrderTimeHistInfo(orderTimeHistQuery); |
|
|
OrderTimeHistEntity lastOrderTimeHistInfo = getLastOrderTimeHistInfo(orderTimeHistQuery); |
|
|
shopOrderHistEntity.setFinishDate(lastOrderTimeHistInfo.getTilltime()); |
|
|
shopOrderHistEntity.setFinishDate(lastOrderTimeHistInfo.getTilltime()); |
|
|
shopOrderHistEntity.setFinishBy(lastOrderTimeHistInfo.getTillenteredby()); |
|
|
shopOrderHistEntity.setFinishBy(lastOrderTimeHistInfo.getTillenteredby()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
// 获取该工序第一次生产时间 |
|
|
// 获取该工序第一次生产时间 |
|
|
|
|
|
orderTimeHistQuery.setEventtype("F"); |
|
|
OrderTimeHistEntity firstOrderTimeHistInfo = getFirstOrderTimeHistInfo(orderTimeHistQuery); |
|
|
OrderTimeHistEntity firstOrderTimeHistInfo = getFirstOrderTimeHistInfo(orderTimeHistQuery); |
|
|
shopOrderHistEntity.setStartDate(firstOrderTimeHistInfo.getEventtime()); |
|
|
shopOrderHistEntity.setStartDate(firstOrderTimeHistInfo.getEventtime()); |
|
|
shopOrderHistEntity.setStartBy(firstOrderTimeHistInfo.getEnteredby()); |
|
|
shopOrderHistEntity.setStartBy(firstOrderTimeHistInfo.getEnteredby()); |
|
|
|