no message

skyouc

2 天以前 d66e1eb699332349c3e2c1f170760f946fcfaf5c

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

@@ -131,6 +131,8 @@
    private StationRelaService stationRelaService;
    @Autowired
    private BasStationDetlService basStationDetlService;
    @Autowired
    private WorkService workService;

    @Override
    @Transactional
@@ -589,12 +591,10 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void comb(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
        if (Objects.isNull(param.getBarcode())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if (param.getCombMats().size() < 1) {
            throw new CoolException("请提取一个商品，或者刷新重新组托！");
        }

        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())
                .eq("io_status", "N")) > 0) {
@@ -626,51 +626,69 @@
        Date now = new Date();
        // 无单组托
        if (Cools.isEmpty(param.getOrderNo())) {
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
                        elem.getStandby2(), elem.getStandby3(),
                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
                        elem.getThreeCode());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
                    detlDtos.add(detlDto);
                }
            });

            for (DetlDto detlDto : detlDtos) {
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                }
                if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
                    throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty());
                }
            //空板组托
            if (param.getPakinType().equals("3")) {
                WaitPakin waitPakin = new WaitPakin();
                BeanUtils.copyProperties(mat, waitPakin);
                waitPakin.setBatch(detlDto.getBatch());
                waitPakin.setZpallet(param.getBarcode());
                waitPakin.setIoStatus("N");
                waitPakin.setAnfme(detlDto.getAnfme());
                waitPakin.setThreeCode(detlDto.getThreeCode());
                waitPakin.setStatus("Y");
                waitPakin.setSuppCode(detlDto.getStandby1());
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                waitPakin.setBoxType1(detlDto.getBoxType1());
                waitPakin.setBoxType2(detlDto.getBoxType2());
                waitPakin.setBoxType3(detlDto.getBoxType3());
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
            } else {
                if (param.getCombMats().size() < 1) {
                    throw new CoolException("请提取一个商品，或者刷新重新组托！");
                }
                // 生成入库通知档
                List<DetlDto> detlDtos = new ArrayList<>();
                param.getCombMats().forEach(elem -> {
                    DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
                            elem.getStandby2(), elem.getStandby3(),
                            elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
                            elem.getThreeCode());
                    if (DetlDto.has(detlDtos, detlDto)) {
                        DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                        assert one != null;
                        one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                    } else {
                        detlDtos.add(detlDto);
                    }
                });

                for (DetlDto detlDto : detlDtos) {
                    Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                    if (Cools.isEmpty(mat)) {
                        throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                    }
                    if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
                        throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty());
                    }
                    WaitPakin waitPakin = new WaitPakin();
                    BeanUtils.copyProperties(mat, waitPakin);
                    waitPakin.setBatch(detlDto.getBatch());
                    waitPakin.setZpallet(param.getBarcode());
                    waitPakin.setIoStatus("N");
                    waitPakin.setAnfme(detlDto.getAnfme());
                    waitPakin.setThreeCode(detlDto.getThreeCode());
                    waitPakin.setStatus("Y");
                    waitPakin.setSuppCode(detlDto.getStandby1());
                    waitPakin.setStandby1(detlDto.getStandby1());
                    waitPakin.setStandby2(detlDto.getStandby2());
                    waitPakin.setStandby3(detlDto.getStandby3());
                    waitPakin.setBoxType1(detlDto.getBoxType1());
                    waitPakin.setBoxType2(detlDto.getBoxType2());
                    waitPakin.setBoxType3(detlDto.getBoxType3());
                    waitPakin.setAppeUser(userId);
                    waitPakin.setAppeTime(now);
                    waitPakin.setModiUser(userId);
                    waitPakin.setModiTime(now);
                    if (!waitPakinService.insert(waitPakin)) {
                        throw new CoolException("保存入库通知档失败");
                    }
                }
            }
            // 关联组托
@@ -1189,15 +1207,15 @@
        // 获取库位
        LocMast locMast = locMastService.selectById(locDetl.getLocNo());
        // 获取路径
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", ioType)
                .eq("stn_no", staNo.getDevNo())
                .eq("crn_no", locMast.getCrnNo());

        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {
            throw new CoolException("出库路径不存在");
        }
//        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
//                .eq("type_no", ioType)
//                .eq("stn_no", staNo.getDevNo())
//                .eq("crn_no", locMast.getCrnNo());
//
//        StaDesc staDesc = staDescService.selectOne(wrapper);
//        if (Cools.isEmpty(staDesc)) {
//            throw new CoolException("出库路径不存在");
//        }
        // 生成工作号
        int workNo = commonService.getWorkNo(2);
        // 生成工作档
@@ -1208,8 +1226,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"); // 拣料
@@ -1362,7 +1380,8 @@
                    .eq("area_id", basAreas.getId())
                    .eq("loc_no", locCache.getLocNo()));
            if (Objects.isNull(locDetls) || locDetls.isEmpty()) {
                throw new CoolException("库存明细不存在！！");
                continue;
//                throw new CoolException("库存明细不存在！！");
            }

            Set<String> set = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
@@ -1777,33 +1796,62 @@
            param.setLocType1((short) 1);
        }


        log.info("WCS任务生成请求参数：", JSONObject.toJSONString(param));


        BasDevp station = basDevpService.selectOne(new EntityWrapper<BasDevp>()
                .eq("dev_no", param.getSourceStaNo()));
        if (Objects.isNull(station)) {
            throw new CoolException("站点不存在!!");
        BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
        if (Objects.isNull(container)) {
            throw new CoolException("容器编码未维护，请维护后再操作！！");
        }

        List<WaitPakin> waitPakins = waitPakinService
                .selectList(new EntityWrapper<WaitPakin>()
                        .eq("io_status", "N")
                        .eq("zpallet", param.getBarcode()));
        if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
            throw new CoolException("数据错误,组拖档已不存在!!");
        Integer whsType = 1;
        //用于判断料箱托盘，料箱，笼框
        if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
            whsType = 3;
        } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
            whsType = 2;
        }

        WrkMast wrkMast = generateCrnInTask(waitPakins, station, param.getLocType1(), userId);
        WrkMast barcode = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (!Objects.isNull(barcode) && (barcode.getIoType() == 104 || barcode.getIoType() == 103 || barcode.getIoType() == 107) && barcode.getWrkSts() == 14L) {
            //
            workService.pickWrkMast(barcode.getWrkNo() + "", userId);

        Map<String, Object> response = new HashMap<>();
        response.put("taskNo", wrkMast.getWrkNo());
        response.put("locNo", wrkMast.getLocNo());
        response.put("taskPri", wrkMast.getIoPri());
            Map<String, Object> response = new HashMap<>();
            response.put("taskNo", barcode.getWrkNo());
            response.put("locNo", barcode.getLocNo());
            response.put("taskPri", barcode.getIoPri());

        return R.ok("任务生成成功").add(response);
            return R.ok("任务生成成功").add(response);
        } else {
            log.info("WCS任务生成请求参数：{}", JSONObject.toJSONString(param));

            BasDevp station = basDevpService.selectOne(new EntityWrapper<BasDevp>()
                    .eq("dev_no", param.getSourceStaNo()));
            if (Objects.isNull(station)) {
                throw new CoolException("站点不存在!!");
            }
            Map<String, Object> response = new HashMap<>();

            if (Objects.isNull(barcode)) {
                List<WaitPakin> waitPakins = waitPakinService
                        .selectList(new EntityWrapper<WaitPakin>()
                                .eq("io_status", "N")
                                .eq("zpallet", param.getBarcode()));
                if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
                    throw new CoolException("数据错误,组拖档已不存在!!");
                }

                WrkMast wrkMast = generateCrnInTask(waitPakins, whsType, station, param.getLocType1(), userId);

                response.put("taskNo", wrkMast.getWrkNo());
                response.put("locNo", wrkMast.getLocNo());
                response.put("taskPri", wrkMast.getIoPri());
            } else {
                response.put("taskNo", barcode.getWrkNo());
                response.put("locNo", barcode.getLocNo());
                response.put("taskPri", barcode.getIoPri());
            }

            return R.ok("任务生成成功").add(response);
        }
    }

    /**
@@ -1938,12 +1986,13 @@
    /**
     * 生成堆垛机入库任务
     *
     * @param whsType
     * @param station
     * @author Ryan
     * @date 2025/12/9 13:54
     */
    @Transactional(rollbackFor = Exception.class)
    public WrkMast generateCrnInTask(List<WaitPakin> waitPakins, BasDevp station, Short locType, Long userId) {
    public WrkMast generateCrnInTask(List<WaitPakin> waitPakins, Integer whsType, BasDevp station, Short locType, Long userId) {
        Date now = new Date();
//        StationRela rela = stationRelaService.selectOne(new EntityWrapper<StationRela>()
//                .eq("agv_sta", station.getDevNo())
@@ -1999,7 +2048,7 @@
            }

        } else {
            StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), findLocNoAttributeVo, locTypeDto);
            StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), whsType, findLocNoAttributeVo, locTypeDto);

            int workNo = dto.getWorkNo();
            // 生成工作档
@@ -2050,14 +2099,21 @@

        // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            if (!Objects.isNull(waitPakin.getMatnr())) {
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(waitPakin);
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.setIoTime(wrkMast.getIoTime());
                wrkDetl.setAppeTime(now);
                wrkDetl.setModiTime(now);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作明细失败");
                }
            } else {
                wrkMast.setWrkSts(1L);
                wrkMast.setIoType(10);

                wrkMastService.updateById(wrkMast);
            }
        });

@@ -2650,6 +2706,7 @@

    /**
     * 6.15WCS申请在库库位更换库位
     *
     * @param combParam
     * @param l
     * @return