#

pang.jiabao

2024-08-19 67cbba6a2fcba931216ea3cb6d0080f8db10dab7

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

@@ -1084,6 +1084,7 @@

        for (Mat obj : list) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(obj);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setAnfme(1.0);
            // 重新定位木箱位置
@@ -1098,7 +1099,6 @@
                    break;
                }
            }
            wrkDetl.sync(obj);
            wrkDetl.setIoTime(now);
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
@@ -1171,6 +1171,32 @@
        pushStaNoToGwcs(param.getPalletizingNo(),wrkMast.getSourceStaNo(),workNo,param.getBarcode());

        return R.ok("空托回流请求成功");
    }

    @Override
    public R tb(TbParam param) {
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
        if (wrkDetls.isEmpty()) {
            return R.parse("无物料明细信息");
        }
        List<String> collect = wrkDetls.stream().map(WrkDetl::getUnit).distinct().collect(Collectors.toList());
        return R.ok(collect);
    }

    @Override
    public R dd(TbParam param) {
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
        if (wrkDetls.isEmpty()) {
            return R.parse("无物料明细信息");
        }
        List<DdParam> collect = wrkDetls.stream().map(wrkDetl -> {
            DdParam ddParam = new DdParam();
            ddParam.setBoxPos(wrkDetl.getOrigin());
            ddParam.setBoxType(wrkDetl.getColor());
            return ddParam;
        }).distinct().collect(Collectors.toList());

        return R.ok(collect);
    }

    @Override
@@ -1550,13 +1576,13 @@

        // 查询要拆的位置，只有一个
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        List<String> collect = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
        String position = collect.get(0);
        WrkDetl wrkDetl = wrkDetls.get(0);

        // 返回拆垛规则
        ZphjcdgzVo zphjcdgzVo = new ZphjcdgzVo();
        zphjcdgzVo.setWorkNo(wrkMast.getWrkNo());
        zphjcdgzVo.setPosition(position);
        zphjcdgzVo.setWorkNo(wrkDetl.getWrkNo());
        zphjcdgzVo.setBoxType(wrkDetl.getColor());
        zphjcdgzVo.setPosition(wrkDetl.getOrigin());

        return R.ok(zphjcdgzVo);
    }