pang.jiabao
2024-07-11 685f52f102a2fe6d519041400b6f2e7face9cd6d
打开深库位出库浅库位有货问题
2个文件已修改
44 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -606,18 +606,18 @@
                        // 双深库位且浅库位有货,则需先对浅库位进行库位移转
                        if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
//                            // 获取浅库位,状态为S直接出,状态为R,则找到这个库位的工作档,提升优先级先出
//                            String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
//                            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
//                            if (locMast.getLocSts().equals("R")) {
//                                List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo()));
//                                if (!wrkMastList.isEmpty()) {
//                                    TaskWrk wrkMast = wrkMastList.get(0);
//                                    wrkMast.setIoPri(99);
//                                    taskWrkMapper.updateById(wrkMast);
//                                    continue;
//                                }
//                            }
                            // 获取浅库位,状态为S直接出,状态为R,则找到这个库位的工作档,提升优先级先出
                            String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
                            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
                            if (locMast.getLocSts().equals("R")) {
                                List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo()));
                                if (!wrkMastList.isEmpty()) {
                                    TaskWrk wrkMast = wrkMastList.get(0);
                                    wrkMast.setIoPri(99);
                                    taskWrkMapper.updateById(wrkMast);
                                    continue;
                                }
                            }
                            taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -130,16 +130,16 @@
        }
        // 更新库位状态,入库还没分配库位,扫码之后才分配
//        if (param.getIoType() == 2 || param.getIoType() == 3) {
//            try {
//            LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
//            locMast.setLocSts(stats);
//            log.info("-----入库更新库位状态为:R成功----------"+ locMast.getLocNo());
//            locMastService.updateById(locMast);
//            } catch (Exception e){
//                log.error("-----出库更新库位状态为:R异常----------"+ e);
//            }
//        }
        if (param.getIoType() == 2 || param.getIoType() == 3) {
            try {
            LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
            locMast.setLocSts(stats);
            log.info("-----入库更新库位状态为:R成功----------"+ locMast.getLocNo());
            locMastService.updateById(locMast);
            } catch (Exception e){
                log.error("-----出库更新库位状态为:R异常----------"+ e);
            }
        }
        if (!taskWrkService.insert(taskWrk)) {
            return R.error("创建任务失败");