bug修复

skyouc

1 天以前 05466547c913ad2cd29944e5444dd387ce64b25f

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -427,10 +427,9 @@
                    }

                    String agvSta = null;
                    if (wrkMast.getIoType() == TaskIOType.MERGE_OUT.type) {
                    if (wrkMast.getIoType() == TaskIOType.MERGE_IN.type) {
                        agvSta = wrkMast.getPauseMk();
                    }

                    // . 删除缓存站点明细
                    if (!Objects.isNull(agvSta)) {
                        // 修改目标站点信息
@@ -444,9 +443,6 @@
                            throw new CoolException("站点状态更新失败！！");
                        }
                    }



                    break;
                // 盘点入库
                case 57:
@@ -769,6 +765,7 @@
                throw new CoolException("站点：" + task.getSourceStaNo() + ", 不存在！！");
            }
            devNo.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
            devNo.setBarcode(task.getBarcode());
            devNo.setModiTime(new Date());
            if (!basStationService.updateById(devNo)) {
                throw new CoolException("站点信息修改失败！！");
@@ -831,8 +828,6 @@
                throw new CoolException("当前库位状态" + locMast.getLocSts() + ", 无法执行出库操作！！");
            }



            task.setWrkSts(15L);
            if (!taskService.updateById(task)) {
                throw new CoolException("任务状态修改失败！！");
@@ -882,6 +877,20 @@
    @Transactional(rollbackFor = Exception.class)
    public ReturnT<String> agvDoIn(Task wrkMast) {
        LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));

        if (!Objects.isNull(wrkMast.getSourceStaNo())) {
            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
                    .eq("dev_no", wrkMast.getSourceStaNo()));
            if (!Objects.isNull(station)) {
                List<String> list = Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_D.type);
                if (!list.contains(station.getLocSts())) {
                    station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                }
                station.setBarcode(null);
                basStationService.updateById(station);
            }
        }

        if(wrkMast.getIoType().equals(1)){
            if (Objects.isNull(locCache)) {
                throw new CoolException("数据错误，库位不存在！！");