| | |
| | | |
| | | import java.util.ArrayList; |
| | | import java.util.List; |
| | | import java.util.Objects; |
| | | |
| | | @Slf4j |
| | | @Service("orderService") |
| | |
| | | @Override |
| | | public void checkComplete(String orderNo) { |
| | | Order order = this.selectByNo(orderNo); |
| | | if (order.getSettle() >= 4L) { |
| | | if (Cools.isEmpty(order) || order.getSettle() >= 4L) { |
| | | return; |
| | | } |
| | | List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId())); |
| | |
| | | break; |
| | | } |
| | | } |
| | | if (complete) { |
| | | // 出库订单重新整理明细 |
| | | DocType docType = docTypeService.selectById(order.getDocType()); |
| | | if (null != docType && docType.getPakout() == 1) { |
| | | if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) { |
| | | throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败"); |
| | | } |
| | | List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo); |
| | | for (WrkDetl wrkDetl : wrkDetls) { |
| | | OrderDetl orderDetl = new OrderDetl(); |
| | | orderDetl.sync(wrkDetl); |
| | | orderDetl.setQty(orderDetl.getAnfme()); |
| | | orderDetl.setOrderId(order.getId()); |
| | | orderDetl.setOrderNo(orderNo); |
| | | orderDetl.setStatus(1); |
| | | orderDetl.setCreateTime(order.getCreateTime()); |
| | | orderDetl.setCreateBy(order.getCreateBy()); |
| | | orderDetl.setUpdateTime(order.getUpdateTime()); |
| | | orderDetl.setUpdateBy(order.getUpdateBy()); |
| | | if (!orderDetlService.insert(orderDetl)) { |
| | | throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败"); |
| | | } |
| | | } |
| | | } |
| | | //当该订单明细数量==完成数量且>上报数量,上报状态为 否 或者 是 时都改成等待上报,定时器轮询等待上报进行上报 |
| | | for (OrderDetl orderDetl : orderDetls) { |
| | | if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())&& |
| | | orderDetl.getQty()>orderDetl.getUnits() |
| | | &&orderDetl.getInspect()<2) { |
| | | |
| | | orderDetl.setInspect(2);//等待上报 |
| | | orderDetlService.updateById(orderDetl); |
| | | } |
| | | } |
| | | if (complete) { |
| | | if (!this.updateSettle(order.getId(), 4L, null)) { |
| | | throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败"); |
| | | } |
| | |
| | | if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { |
| | | throw new CoolException("修改单据明细数量失败"); |
| | | } |
| | | // 修改订单作业数量 |
| | | if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { |
| | | throw new CoolException("修改单据作业数量失败"); |
| | | } |
| | | } |
| | | } catch (Exception e) { |
| | | log.error("", e); |
| | | log.error("saveHandlerOrder===>>", e); |
| | | return false; |
| | | } |
| | | return true; |
| | |
| | | } |
| | | |
| | | @Override |
| | | public List<Order> selectComplete8() { |
| | | return this.baseMapper.selectComplete8(); |
| | | } |
| | | |
| | | @Override |
| | | public boolean addToLogTable(Order order) { |
| | | return this.baseMapper.addToLogTable(order) > 0; |
| | | } |
| | | |
| | | @Override |
| | | public List<Order> selectorderNoL(String orderNo) { |
| | | return this.baseMapper.selectorderNoL(orderNo); |
| | | } |
| | | |
| | | @Override |
| | | public Order selectOrderMoveStatus() { |
| | | return this.baseMapper.selectOrderMoveStatus(); |
| | | } |
| | | @Override |
| | | public Order selectOrderMoveStatusInitial() { |
| | | return this.baseMapper.selectOrderMoveStatusInitial(); |
| | | } |
| | | |
| | | } |