日志查询功能完善

cp

2025-01-04 a5ff9433c3e8a552205a15e83fcbe7ce4281b789

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java

@@ -80,6 +80,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true, hostId);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        locTypeDto.setLocRangeDto(param.getLocRangeDto());

        StartupDto dto = null;
        switch (param.getIoType()) {
@@ -107,7 +108,9 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true, hostId);
        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, devpNo, hostId, locTypeDto, 0);
        String batch = waitPakins.get(0).getBatch();
        String owner = waitPakins.get(0).getOwner();
        StartupDto dto = commonService.getLocNo(1, devpNo, matNos, batch, hostId, locTypeDto, 0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -130,6 +133,8 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setHostId(hostId);
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setOwner(owner);
        boolean res = wrkMastService.save(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
@@ -143,6 +148,7 @@
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setHostId(hostId);
            wrkDetl.setWrkMastId(wrkMast.getId());
            if (!wrkDetlService.save(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
@@ -182,7 +188,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true, hostId);
        // 检索库位
        StartupDto dto = commonService.getLocNo(10, devpNo, hostId, locTypeDto, 0);
        StartupDto dto = commonService.getLocNo(10, devpNo, null, null, hostId, locTypeDto, 0);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -199,6 +205,7 @@
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setBarcode(barcode);
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(new Date());