#

LSH

2023-11-12 534b0f2b7bf694d126aa676be46277a0b4355c1d

 src/main/java/com/zy/common/web/WcsController.java

@@ -7,10 +7,12 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
@@ -97,6 +99,9 @@
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
//            case 201://自动补空板任务
//                dto = emptyPlateIn201(param.getSourceStaNo(), locTypeDto, param.getBarcode());
//                break;
            default:
                break;
        }
@@ -111,7 +116,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);

        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 15, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null,null,null, locTypeDto);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -146,7 +151,7 @@
            return R.error("库存没有空板");
        }
        EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
        emptyPlateOutParam.setOutSite(11);
        emptyPlateOutParam.setOutSite(12);
        emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
        WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
        return R.ok(!Cools.isEmpty(wrkMast)? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
@@ -159,9 +164,11 @@
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);

        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
        List<KeyValueVo> list = waitPakins.stream().map(item-> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
//        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -236,7 +243,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -283,4 +290,57 @@
        return dto;
    }

    /*...........................徐工汉云..............以下.............上饶江铜...........................*/
    /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/

    //    201、自动补空板
//    @Transactional
//    public StartupDto emptyPlateIn201(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
//        // 源站点状态检测
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
//        // 检索库位
//        StartupDto dto =  commonService.getScanBarcodeEmptyBoard();
//        if (dto.getStaNo()==0){
//            return null;
//        }
//        Date now = new Date();
//        dto.setSourceStaNo(devpNo);
//        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
//        // 生成工作档
//        WrkMast wrkMast = new WrkMast();
//        wrkMast.setWrkNo(workNo);
//        wrkMast.setIoTime(new Date());
//        wrkMast.setWrkSts(41L); // 工作状态：前往码垛位
//        wrkMast.setIoType(201); // 入出库状态：201、自动补空板
//        wrkMast.setIoPri(13D); // 优先级
//        wrkMast.setCrnNo(0);
//        wrkMast.setSourceStaNo(dto.getSourceStaNo());
//        wrkMast.setStaNo(dto.getStaNo());
//        wrkMast.setLocNo("");
//        wrkMast.setFullPlt("N"); // 满板
//        wrkMast.setPicking("N"); // 拣料
//        wrkMast.setExitMk("N"); // 退出
//        wrkMast.setEmptyMk("Y"); // 空板
//        wrkMast.setLinkMis("Y");
//        wrkMast.setBarcode(barcode);
//        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
//        // 操作人员数据
//        wrkMast.setAppeTime(now);
//        wrkMast.setModiTime(now);
//
//        boolean res = wrkMastService.insert(wrkMast);
//        if (!res) {
//            throw new CoolException("保存工作档失败");
//        }
//        // 更新源站点信息
//        sourceStaNo.setWrkNo(workNo);
//        sourceStaNo.setModiTime(now);
//        if (!basDevpService.updateById(sourceStaNo)){
//            throw new CoolException("更新源站失败");
//        }
//        return dto;
//    }
    /*...........................上饶江铜..............以上.............徐工汉云...........................*/


}