#

luxiaotao1123

2022-12-09 d210be88a9bccdc1c98d466c5dacbf14d7528711

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

@@ -61,7 +61,9 @@
                return R.error("条码不能为空");
            }
            mat = matService.selectByMatnr(param.getBarcode());

            if (Cools.isEmpty(mat)) {
                return R.error(param.getBarcode() + "条码商品资料不存在，请先添加！");
            }
//            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
//            if (Cools.isEmpty(waitPakins)) {
//                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -115,7 +117,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<Mat> mats = Collections.singletonList(mat);
        List<String> matnrList = mats.stream().map(Mat::getMatnr).distinct().collect(Collectors.toList());
        List<String> matnrList = mats.stream().map(Mat::getMaktx).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
@@ -253,7 +255,7 @@
            throw new CoolException(CodeRes.NONE_DETL_900);
        }
        // 检索库位
        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMaktx).distinct().collect(Collectors.toList());
        return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 库位号， 堆垛机，目标站
    }