输送线组托功能优化

skyouc

1 天以前 a6df3df0ddf1b121f78ea895da9b557c41ec3804

输送线组托功能优化

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

@@ -63,6 +63,13 @@
    @PostMapping("/agv/collectionPakin/view")
    @ManagerAuth
    public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params) {
        if (Objects.isNull(params.getOrgBarcode())) {
            return R.error("源托盘不能为空！");
        }
        if (Objects.isNull(params.getMatnr())) {
            return R.error("物料编码不能为空！！");
        }

        return mobileService.collectionPakinView(params);
    }


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

@@ -12,6 +12,8 @@

    private String tarBarcode;

    private String matnr;

    private String devNo;

    private List<CombMat> combMats;

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

@@ -1180,7 +1180,7 @@
    @Override
    @Transactional
    public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
            Double curOutQty, Integer ioType, Long userId, Date now) {
                         Double curOutQty, Integer ioType, Long userId, Date now) {
        // 获取库位
        LocMast locMast = locMastService.selectById(locDetl.getLocNo());
        // 获取路径
@@ -1811,10 +1811,11 @@

    /**
     * SO/EO 区组托
     * @author Ryan
     * @date 2025/12/18 15:19
     *
     * @param params
     * @return com.core.common.R
     * @author Ryan
     * @date 2025/12/18 15:19
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -1925,6 +1926,10 @@
                && wrkMast.getIoType().equals(TaskIOType.PICK_OUT.type)) {
            throw new CoolException("人物类型错误");
        }

        wrkDetlService.selectList(new EntityWrapper<WrkDetl>()
                .eq(!Objects.isNull(params.getMatnr()), "matnr", params.getMatnr())
                .eq("wrk_no", wrkMast.getWrkNo()));

        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        if (Cools.isEmpty(wrkDetls)) {
@@ -2054,7 +2059,6 @@
                throw new CoolException("保存工作明细失败");
            }
        });



//        // 更新入库通知档 ioStatus ===>> Y
@@ -2229,7 +2233,7 @@
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo()));
            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            if (Cools.isEmpty(wrkMast1)){
            if (Cools.isEmpty(wrkMast1)) {
                Integer outSta = devp.getDevNo();
                // 获取路径
                StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
@@ -2261,7 +2265,7 @@
                if (!wrkMastService.insert(wrkMast)) {
                    throw new CoolException("保存工作档失败，出库库位号：" + locMast.getLocNo());
                }
            }else {
            } else {
                workNo = wrkMast1.getWrkNo();
            }
            // 生成工作档明细
@@ -2540,10 +2544,11 @@

    /**
     * 呼叫AGV空台车返回
     * @author Ryan
     * @date 2025/9/24
     *
     * @param callAgvBackParam
     * @return com.core.common.R
     * @author Ryan
     * @date 2025/9/24
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -2554,7 +2559,7 @@

        // 按当前查找库位顺序，查到一个后，不再往下查询
        LocCache locCache = findPriorityLocCache();
        

        if (Objects.isNull(locCache)) {
            return R.error("未查询到可用库位");
        }