src/main/java/com/zy/asrs/controller/MobileController.java

@@ -69,7 +69,6 @@
    @Autowired
    private OrderPakoutService orderPakoutService;


    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;


 src/main/java/com/zy/asrs/entity/LocCache.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -145,6 +146,7 @@
    private Date appeTime;

    @ApiModelProperty(value = "")
    @TableField(value ="barcode",strategy = FieldStrategy.IGNORED)
    private String barcode;

    @ApiModelProperty("库区ID")

 src/main/java/com/zy/asrs/entity/param/CallAgvParam.java

@@ -23,6 +23,6 @@
    /**
     * agv搬运起始站点
     */
    private int sourceSite;
    private String sourceSite;

}

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

@@ -9,6 +9,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.enums.TaskIOType;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.BasStationMapper;
import com.zy.asrs.mapper.LocMastMapper;
@@ -124,10 +125,13 @@
    @Override
    public R inLocCallAgv(CallAgvParam param,Long userId) {
        int type = param.getType();
        int sourceSite = param.getSourceSite();
        String sourceSite = param.getSourceSite();
        String barcode = param.getBarcode();
        int ioType;

        LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", sourceSite));
        if (null == locCache) {
            throw new CoolException("站点不存在：" + sourceSite);
        }
        switch (type) {
            case 1:
                // 判断有没有组托
@@ -135,7 +139,10 @@
                if (count == 0) {
                    throw new CoolException("条码未组托：" + barcode);
                }
                ioType = 1;
                ioType = 101;

                locCache.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
                locCacheService.updateById(locCache);
                break;
            case 2:
                // 判断是拣选回库托盘
@@ -147,6 +154,9 @@
                    throw new CoolException("条码不需要回库：" + barcode);
                }
                ioType = wrkMast.getIoType() - 50;

                locCache.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
                locCacheService.updateById(locCache);
                break;
            case 3:
                // 判断条码在wms不存在，是空托盘
@@ -205,9 +215,31 @@
        // 入库暂存+1
        basDevpMapper.incrementInQty(endSite);

        // 插入agv任务
        Task task = new Task(0, 7L, ioType, String.valueOf(sourceSite), String.valueOf(endSite), userId, barcode);
        taskService.insert(task);

        // 获取工作号
        int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
        // 保存工作档
        Task task = new Task();
        Date now = new Date();
        task.setWrkNo(workNo)
                .setIoTime(now)
                .setWrkSts(7L) // 工作状态：11.生成出库ID
                .setIoType(ioType) // 入出库状态： 1.入库
                .setTaskType("agv")
                .setIoPri(10D)
                .setStaNo(String.valueOf(endSite))
                .setFullPlt(ioType != 10 ? "N" : "Y")// 满板：Y
                .setPicking("N") // 拣料
                .setExitMk("N")// 退出
                .setSourceLocNo(sourceSite)
                .setEmptyMk(ioType == 10 ? "Y" : "N")// 空板
                .setBarcode(barcode)// 托盘码
                .setLinkMis("N")
                .setAppeTime(now)
                .setModiTime(now);
        if (!taskService.insert(task)) {
            throw new CoolException("保存工作档失败");
        }

        // 更新暂存位状态为 R.出库预约
        basStationMapper.updateLocStsBatch( Collections.singletonList(String.valueOf(sourceSite)), "R");

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

@@ -48,10 +48,10 @@
            throw new CoolException("当前工作档已完成");
        }
        // 入库 + 库位转移
        if (wrkMast.getIoType() < 100){
        if (wrkMast.getIoType() < 50){
            wrkMast.setWrkSts(4L);
            // 出库
        } else if (wrkMast.getWrkSts() > 10) {
        } else  {
            wrkMast.setWrkSts(14L);
        }
        Date now = new Date();

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

@@ -601,6 +601,7 @@
     * @description: AGV出库任务
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public ReturnT<String> agvDoOut(Task task) {
        if (task.getIoType().equals(101)) {
            Date now = new Date();
@@ -635,8 +636,35 @@
            if (!taskService.updateById(task)) {
                throw new CoolException("任务状态修改失败！！");
            }
        } else {
        } else if(task.getIoType().equals(53) || task.getIoType().equals(54) || task.getIoType().equals(57)){
            LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", task.getSourceLocNo()));
            if (Objects.isNull(locCache)) {
                throw new CoolException("数据错误，库位不存在！！");
            }
            if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_R.type)) {
                throw new CoolException("当前库位状态为：" + LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc + "，不是出库预约状态");
            }

            locCache.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
            locCache.setModiTime(new Date());
            locCache.setBarcode(null);
            locCache.setModiTime(new Date());
            locCache.setIoTime(new Date());
            if (!locCacheService.updateById(locCache)) {
                throw new CoolException("库位状态修改失败！");
            }

            boolean deleted = locCacheDetlService.delete(new EntityWrapper<LocCacheDetl>().eq("loc_id", locCache.getId()));

            if (!deleted){
                throw new CoolException("库位明细删除失败！");
            }

            task.setWrkSts(15L);
            task.setModiTime(new Date());
            if (!taskService.updateById(task)) {
                throw new CoolException("任务状态修改失败！！");
            }
        }
        return SUCCESS;
    }
@@ -644,50 +672,55 @@

    @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(locCache)) {
            throw new CoolException("数据错误，库位不存在！！");
        }
        if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_S.type)) {
            throw new CoolException("当前库位状态为：" + LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc + "，不是出库预约状态");
        }
        List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("task_id", wrkMast.getId()));
        if (Objects.isNull(taskDetls)) {
            throw new CoolException("数据错误：组托数据不存在！！");
        }
        taskDetls.forEach(pakin -> {
            LocCacheDetl detl = new LocCacheDetl();
            BeanUtils.copyProperties(pakin, detl);
            detl.setBarcode(pakin.getBarcode())
                    .setLocId(locCache.getId())
                    .setAnfme(pakin.getAnfme())
                    .setBrand(pakin.getBrand())
                    .setAppeTime(new Date())
                    .setSpecs(pakin.getSpecs())
                    .setColor(pakin.getColor())
                    .setLocNo(locCache.getLocNo())
                    .setAreaId(locCache.getAreaId())
                    .setAreaName(locCache.getAreaName())
                    .setUnit(pakin.getUnit())
                    .setBatch(pakin.getBatch());
            if (!locCacheDetlService.insert(detl)) {
                throw new CoolException("库位明细保存失败！！");
        if (wrkMast.getIoType().equals(1)) {
            LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
            if (Objects.isNull(locCache)) {
                throw new CoolException("数据错误，库位不存在！！");
            }
        });
            if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_S.type)) {
                throw new CoolException("当前库位状态为：" + LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc + "，不是出库预约状态");
            }
            List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("task_id", wrkMast.getId()));
            if (Objects.isNull(taskDetls)) {
                throw new CoolException("数据错误：组托数据不存在！！");
            }
            taskDetls.forEach(pakin -> {
                LocCacheDetl detl = new LocCacheDetl();
                BeanUtils.copyProperties(pakin, detl);
                detl.setBarcode(pakin.getBarcode())
                        .setLocId(locCache.getId())
                        .setAnfme(pakin.getAnfme())
                        .setBrand(pakin.getBrand())
                        .setAppeTime(new Date())
                        .setSpecs(pakin.getSpecs())
                        .setColor(pakin.getColor())
                        .setLocNo(locCache.getLocNo())
                        .setAreaId(locCache.getAreaId())
                        .setAreaName(locCache.getAreaName())
                        .setUnit(pakin.getUnit())
                        .setBatch(pakin.getBatch());
                if (!locCacheDetlService.insert(detl)) {
                    throw new CoolException("库位明细保存失败！！");
                }
            });

        locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
        locCache.setModiTime(new Date());
        locCache.setBarcode(wrkMast.getBarcode());
        locCache.setModiTime(new Date());
        locCache.setIoTime(new Date());
        if (!locCacheService.updateById(locCache)) {
            throw new CoolException("库位状态修改失败！");
            locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
            locCache.setModiTime(new Date());
            locCache.setBarcode(wrkMast.getBarcode());
            locCache.setModiTime(new Date());
            locCache.setIoTime(new Date());
            if (!locCacheService.updateById(locCache)) {
                throw new CoolException("库位状态修改失败！");
            }
            wrkMast.setWrkSts(5L);
            wrkMast.setModiTime(new Date());
            if (!taskService.updateById(wrkMast)) {
                throw new CoolException("任务状态修改失败！！");
            }
        }else {
            throw new CoolException("数据错误：ioType不存在！！");
        }
        wrkMast.setWrkSts(5L);
        wrkMast.setModiTime(new Date());
        if (!taskService.updateById(wrkMast)) {
            throw new CoolException("任务状态修改失败！！");
        }


        return SUCCESS;
    }