深浅库位冲突方法修改

pang.jiabao

2024-07-16 e192789a33964b1c3a213d55602dbe787eecdc84

深浅库位冲突方法修改

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -609,7 +609,7 @@
                            // 获取浅库位，状态为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")) {
                            if (locMast.getLocSts().equals("Z")) {
                                List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("start_point", locMast.getLocNo()));
                                if (!wrkMastList.isEmpty()) {
                                    TaskWrk wrkMast = wrkMastList.get(0);
@@ -617,6 +617,8 @@
                                    taskWrkMapper.updateById(wrkMast);
                                    log.warn("{}对应浅库位有货，提升{}库位优先级",taskWrk.getStartPoint(),wrkMast.getStartPoint());
                                    continue;
                                } else {
                                    log.error("{}对应浅库位有货，但没有移库任务",taskWrk.getStartPoint());
                                }
                            }


 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("创建任务失败");