数据结构修改 任务工作档修改 组托工作档修改

skyouc

8 小时以前 285deae97a62db611ee2485d3940e24307594f2a

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

@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -96,6 +97,8 @@

    @Resource
    private OrderDetlPakoutService orderDetlPakoutService;
    @Autowired
    private LocCacheService locCacheService;

    @Override
    @Transactional
@@ -118,8 +121,8 @@
        wrkMast.setIoType(8); // 入出库状态：8.拣料途中并板
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(1);
        wrkMast.setSourceStaNo(1);
        wrkMast.setStaNo(1);
        wrkMast.setSourceStaNo(1 + "");
        wrkMast.setStaNo(1 + "");
        wrkMast.setLocNo(param.getLocNo());
        wrkMast.setBarcode(param.getBarcode()); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
@@ -245,8 +248,8 @@
        wrkMast.setWrkSts(11L); // 工作状态：101.生成出库
        wrkMast.setIoType(104); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 源站
        wrkMast.setStaNo(staDesc.getStnNo() + ""); // 目标站
        wrkMast.setSourceLocNo(param.getLocNo()); // 源库位
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("Y"); // 拣料
@@ -379,8 +382,8 @@
                wrkMast.setIoType(108); // 入出库状态：出库，拣料入库
                wrkMast.setIoPri(13D); // 优先级
                wrkMast.setCrnNo(1);
                wrkMast.setSourceStaNo(1);
                wrkMast.setStaNo(1);
                wrkMast.setSourceStaNo(1 + "");
                wrkMast.setStaNo(1 + "");
                wrkMast.setSourceLocNo(combParam.getLocNo());
                wrkMast.setBarcode(combParam.getBarcode()); // 托盘码
                wrkMast.setFullPlt("Y"); // 满板：Y
@@ -650,6 +653,7 @@
                BeanUtils.copyProperties(mat, waitPakin);
//                waitPakin.sync(mat);
                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
                waitPakin.setOrderId(order.getId());
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
@@ -1072,8 +1076,8 @@
        wrkMast.setIoType(ioType); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 源站
        wrkMast.setStaNo(staDesc.getStnNo() + ""); // 目标站
        wrkMast.setSourceLocNo(locDetl.getLocNo()); // 源库位
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
@@ -1116,4 +1120,132 @@
            throw new CoolException(locDetl.getLocNo() + "库位不是在库状态");
        }
    }

    /**
     * @author Ryan
     * @date 2025/9/22
     * @description: 获取缓冲区库位信息
     * @version 1.0
     */
    @Override
    public R getCacheLocs() {
        return R.ok().add(locCacheService.selectList(new EntityWrapper<LocCache>()
                .eq("frozen", 0)
                .ne("full_plt", "Y")
                .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type).orderAsc(Arrays.asList("row1"))));

    }

    /**
     * @author Ryan
     * @date 2025/9/22
     * @description: 呼叫AGV搬运
     * @version 1.0
     */
    @Override
    public R callAgvMove(AgvCallParams params, Long userId) {
        if (Objects.isNull(params.getTarSite())) {
            throw new CoolException("目标参数不能为空！！");
        }
        if (Objects.isNull(params.getOrgSite())) {
            throw new CoolException("源站点不能为空！！");
        }
        LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>()
                .eq("frozen", 0)
                .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
                .eq("loc_no", params.getTarSite())
                .orderAsc(Arrays.asList("loc_no"))
                .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
        if (Objects.isNull(locCache)) {
            throw new CoolException("请检查目标库位是否闲置中！！");
        }

        generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);

        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/9/22
     * @description: 生成AGV搬运任务
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public void generateAgvTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
        WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
        if (Objects.isNull(pakin)) {
            throw new CoolException("组托信息不存在！！");
        }
        OrderPakin orderPakin = orderPakinService.selectById(pakin.getOrderId());
        if (Objects.isNull(orderPakin)) {
            throw new CoolException("单据不能为空！！");
        }

        List<OrderDetlPakin> detls = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", pakin.getOrderId()));
        if (Objects.isNull(detls) || detls.isEmpty()) {
            throw new CoolException("数据错误：单据明细不存在！！");
        }

        Date now = new Date();
        // 获取工作号
        int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
        // 保存工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(11); // 入出库状态： 11.库格移载
        wrkMast.setTaskType("agv");
        wrkMast.setIoPri(10D);
        wrkMast.setLocNo(loc.getLocNo()); // 目标库位
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setSourceStaNo(orgSite);
        wrkMast.setEmptyMk(loc.getLocSts().equals("D") ? "Y" : "N"); // 空板
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setAppeUser(userId);
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        if (!wrkMastService.insert(wrkMast)) {
            throw new CoolException("保存工作档失败");
        }

        List<WrkDetl> taskDetls = new ArrayList<>();
        detls.forEach(detl -> {
            WrkDetl wrkDetl = new WrkDetl();
            BeanUtils.copyProperties(detl, wrkDetl);
            wrkDetl.setWrkNo(workNo)
                    .setIoTime(new Date())
                    .setAnfme(detl.getAnfme())
                    .setZpallet(pakin.getZpallet())
                    .setBatch(detl.getBatch())
                    .setMatnr(detl.getMatnr())
                    .setMaktx(detl.getMaktx())
                    .setAppeUser(userId)
                    .setUnit(detl.getUnit())
                    .setModel(detl.getModel())
                    .setAppeTime(new Date())
                    .setModiUser(userId);
            taskDetls.add(wrkDetl);
        });
        //保存工作档明细
        if (!wrkDetlService.insertBatch(taskDetls)) {
            throw new CoolException("保存工作档明细失败");
        }
        // 修改目标库位状态
        if (loc.getLocSts().equals("O")) {
            loc.setLocSts("S"); // S.入库预约
            loc.setModiTime(now);
            loc.setModiUser(userId);
            if (!locCacheService.updateById(loc)) {
                throw new CoolException("更新目标库位状态失败");
            }
        } else {
            throw new CoolException("移转失败，目标库位状态：" + loc.getLocSts$());
        }
    }
}