#20231212-1304

Administrator

2023-12-12 3aaa2f73d832be9f277e3bad798896d061c85516

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

@@ -115,7 +115,7 @@
        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);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,waitPakins.get(0).getMatTypeIn());
        if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
            dto.setWorkNo(9999);
            dto.setStaNo(1000);
@@ -159,7 +159,7 @@
        }
        // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            waitPakin.setBatch("");
//            waitPakin.setBatch("");
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -204,7 +204,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
        if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
            dto.setWorkNo(9999);
            dto.setStaNo(1000);
@@ -273,7 +273,7 @@
        }
        // 检索库位
        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
        return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto); // 库位号， 堆垛机，目标站
        return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 库位号， 堆垛机，目标站
    }

}