| | |
|---|
| | | } |
|---|
| | | // 如果 作业数量等于单据总数量 && 工作明细档中无该单据的数据 && AGV工作明细档中无该单据的数据 |
|---|
| | | if (complete |
|---|
| | | && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) < 1 |
|---|
| | | && agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no",orderNo)) < 1) { |
|---|
| | | && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1 |
|---|
| | | && agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no",orderNo)) < 1) { |
|---|
| | | // 出库订单重新整理明细 |
|---|
| | | 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() + "】明细失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // 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() + "】明细失败"); |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | |
|---|
| | | if (!this.updateSettle(order.getId(), 4L, null)) { |
|---|
| | | throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败"); |
|---|
