| | |
| | | * 任务中断,4-放货 |
| | | * 完成,8-任务结束 |
| | | */ |
| | | |
| | | if (statusParam.getTaskStatus() == 0) { |
| | | // //拣料和盘点再入库判断 |
| | | // if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) { |
| | | // List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); |
| | | // String sourcecLocNo = wrkMast.getSourceLocNo(); |
| | | // // 获取后两位的层数(高低库位数据) |
| | | // String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2); |
| | | // int layer = Integer.parseInt(layerStr); |
| | | // // 判断层数 |
| | | // Short locType1 = (short) ((layer == 1) ? 1 : 2); |
| | | // LocTypeDto locTypeDto = new LocTypeDto(); |
| | | // locTypeDto.setLocType1(locType1); |
| | | // //注意一个板只能放同一种物料(检索新库位) |
| | | //// StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetls.get(0).getMatnr(), wrkDetls.get(0).getBatch(), null, 4, locTypeDto, 2); |
| | | // FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(); |
| | | // findLocNoAttributeVo.setMatnr(wrkDetls.get(0).getMatnr()); |
| | | // StartupDto dto = commonService.getLocNoNew(1, 101, findLocNoAttributeVo,locTypeDto,null); |
| | | // Date now = new Date(); |
| | | // wrkMast.setIoTime(now); |
| | | // wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57 |
| | | // wrkMast.setWrkSts(1L);//1.已接收 |
| | | // wrkMast.setSourceStaNo(101); // 源站 |
| | | // wrkMast.setStaNo(null); // 目标站 |
| | | // wrkMast.setLocNo(dto.getLocNo()); // 目标库位 |
| | | // wrkMast.setSourceLocNo(sourcecLocNo); |
| | | // wrkMast.setModiTime(now); |
| | | // wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now); |
| | | // |
| | | // // 修改库位状态 Q.拣料/盘点/并板再入库 |
| | | // LocMast locMast2 = locMastService.selectById(dto.getLocNo()); |
| | | // locMast2.setLocSts("Q"); |
| | | // locMast2.setModiTime(new Date()); |
| | | // if (!locMastService.updateById(locMast2)) { |
| | | // |
| | | // throw new CoolException("修改库位状态失败"); |
| | | // } |
| | | // } else { |
| | | wrkMast.setWrkSts(1L);//1.已接收 |
| | | // } |
| | | } else if (statusParam.getTaskStatus() == 1) { |
| | | wrkMast.setWrkSts(2L);//2.任务开始 |
| | | } else if (statusParam.getTaskStatus() == 2) { |