| | |
|---|
| | | @Override |
|---|
| | | @Transactional(rollbackFor = Exception.class) |
|---|
| | | public Boolean addProductMain(ProductionProductMainDto dto) { |
|---|
| | | LocalDateTime now = LocalDateTime.now(); |
|---|
| | | ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId()); |
|---|
| | | |
|---|
| | | SysUser user = userMapper.selectUserById(dto.getUserId()); |
|---|
| | | ProductionProductMain productionProductMain = new ProductionProductMain(); |
|---|
| | | //当前工艺路线对应的工序详情 |
|---|
| | |
|---|
| | | productionProductMain.setAuditUserId(dto.getAuditUserId()); |
|---|
| | | productionProductMain.setAuditUserName(dto.getAuditUserName()); |
|---|
| | | productionProductMain.setStatus(0); |
|---|
| | | productionProductMain.setStartTime(dto.getStartTime()); |
|---|
| | | productionProductMain.setEndTime(dto.getEndTime()); |
|---|
| | | productionProductMain.setStartTime(productWorkOrder.getStartProductTime()); |
|---|
| | | productionProductMain.setEndTime(now); |
|---|
| | | productionProductMain.setDeviceId(productProcess.getDeviceId()); |
|---|
| | | productionProductMain.setDeviceName(productProcess.getDeviceName()); |
|---|
| | | productionProductMainMapper.insert(productionProductMain); |
|---|
| | |
|---|
| | | if (productQty.compareTo(BigDecimal.ZERO) > 0) { |
|---|
| | | List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId())); |
|---|
| | | /*更新工单和生产订单*/ |
|---|
| | | ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId()); |
|---|
| | | productWorkOrder.setCompleteQuantity(productWorkOrder.getCompleteQuantity().add(productQty)); |
|---|
| | | if (ObjectUtils.isNull(productWorkOrder.getActualStartTime())) { |
|---|
| | | productWorkOrder.setActualStartTime(LocalDate.now());//实际开始时间 |
|---|
| | |
|---|
| | | if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) == 0) { |
|---|
| | | productWorkOrder.setActualEndTime(LocalDate.now());//实际结束时间 |
|---|
| | | } |
|---|
| | | productWorkOrder.setEndProductTime(now); |
|---|
| | | productWorkOrderMapper.updateById(productWorkOrder); |
|---|
| | | //生产订单 |
|---|
| | | ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId()); |
|---|
| | | if (ObjectUtils.isNull(productOrder.getStartTime())) { |
|---|
| | | productOrder.setStartTime(LocalDateTime.now());//开始时间 |
|---|
| | | productOrder.setStartTime(now);//开始时间 |
|---|
| | | } |
|---|
| | | if (productProcessRouteItem.getDragSort() == productProcessRouteItems.size()) { |
|---|
| | | //如果是最后一道工序报工之后生产订单完成数量+ |
|---|
| | | productOrder.setCompleteQuantity(productOrder.getCompleteQuantity().add(productQty)); |
|---|
| | | if (productOrder.getCompleteQuantity().compareTo(productOrder.getQuantity()) == 0) { |
|---|
| | | productOrder.setEndTime(LocalDateTime.now());//结束时间 |
|---|
| | | productOrder.setEndTime(now);//结束时间 |
|---|
| | | } |
|---|
| | | } |
|---|
| | | productOrderMapper.updateById(productOrder); |
|---|
