| | |
|---|
| | | @Override |
|---|
| | | @Transactional |
|---|
| | | public void cancelWrkMast(String workNo, Long userId) { |
|---|
| | | Date now = new Date(); |
|---|
| | | WrkMast wrkMast = wrkMastService.selectById(workNo); |
|---|
| | | if (Cools.isEmpty(wrkMast)){ |
|---|
| | | throw new CoolException(workNo+"工作档不存在"); |
|---|
| | |
|---|
| | | throw new CoolException("取消库位转移失败，源库位不存在:"+ wrkMast.getSourceLocNo()); |
|---|
| | | } |
|---|
| | | locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F"); |
|---|
| | | locMast.setModiTime(new Date()); |
|---|
| | | locMast.setModiTime(now); |
|---|
| | | locMast.setModiUser(userId); |
|---|
| | | locMastService.updateById(locMast); |
|---|
| | | } |
|---|
| | |
|---|
| | | throw new CoolException("取消库位转移失败，目标库位不存在:"+ wrkMast.getSourceLocNo()); |
|---|
| | | } |
|---|
| | | locMast.setLocSts("O"); |
|---|
| | | locMast.setModiTime(new Date()); |
|---|
| | | locMast.setModiTime(now); |
|---|
| | | locMast.setModiUser(userId); |
|---|
| | | locMastService.updateById(locMast); |
|---|
| | | } |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) { |
|---|
| | | // OrderDetl orderDetl = orderDetlService.selectItem() |
|---|
| | | List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); |
|---|
| | | for (WrkDetl wrkDetl : wrkDetls) { |
|---|
| | | if (!Cools.isEmpty(wrkDetl.getOrderNo())) { |
|---|
| | | if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) { |
|---|
| | | throw new CoolException("订单数据回滚失败"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //修改订单主表状态,没有作业数量时才可以修改 |
|---|
| | | boolean flag = true; |
|---|
| | | List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo())); |
|---|
| | | for(OrderDetl orderDetl : orderDetls){ |
|---|
| | | if(orderDetl.getWorkQty() > 0){ |
|---|
| | | flag = false; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if(flag){ |
|---|
| | | Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo())); |
|---|
| | | if(!Cools.isEmpty(order) && order.getSettle()==2){ |
|---|
| | | order.setSettle(1L); |
|---|
| | | order.setUpdateBy(userId); |
|---|
| | | order.setUpdateTime(now); |
|---|
| | | } |
|---|
| | | if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){ |
|---|
| | | throw new CoolException("修改订单状态失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | // // 订单关联 |
|---|
| | |
|---|
| | | // 取消操作人员记录 |
|---|
| | | wrkMast.setManuType("手动取消"); |
|---|
| | | wrkMast.setModiUser(userId); |
|---|
| | | wrkMast.setModiTime(new Date()); |
|---|
| | | wrkMast.setModiTime(now); |
|---|
| | | if (!wrkMastService.updateById(wrkMast)) { |
|---|
| | | throw new CoolException("取消工作档失败"); |
|---|
| | | } |
|---|
| | |
|---|
| | | throw new CoolException("取消工作档失败，库位不存在:"+ locNo); |
|---|
| | | } |
|---|
| | | locMast.setLocSts(locSts); |
|---|
| | | locMast.setModiTime(new Date()); |
|---|
| | | locMast.setModiTime(now); |
|---|
| | | locMast.setModiUser(userId); |
|---|
| | | boolean locMastRes = locMastService.updateById(locMast); |
|---|
| | | if (!wrkMastRes || !locMastRes) { |
|---|
