#

whycq

2025-01-08 d3cb0e841e6585aa84a45f18bb30965db8d1a6aa

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

@@ -49,6 +49,8 @@
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;
    @Autowired
    private BasCrnpService basCrnpService;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -71,7 +73,7 @@
                if (wrkMast != null && wrkMast.getIoType() == 103) {
                    return R.parse(CodeRes.PICK_600);
                }
                return R.parse(CodeRes.NO_COMB_700);
                return R.error(param.getBarcode() + "此条码未组托，请先组托！");
            }
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",param.getBarcode())
@@ -163,7 +165,28 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        Integer integer = rowLastnoService.selectNextWhsType();
        int rowCount = rowLastnoService.selectCount(null);
        Integer integer = 2;
        for (int i = 1; i <= rowCount; i++) {
            integer = rowLastnoService.selectNextWhsType();
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                    .eq("crn_no", integer));
            if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 3){
                break;
            }
        }
        String fullPlt = "N";
        for (WaitPakin waitPakin : waitPakins) {
            if (Cools.isEmpty(waitPakin.getIsFull())) {
                fullPlt = "N";
                break;
            }
            if (waitPakin.getIsFull().equals("Y")) {
                fullPlt = "Y";
                break;
            }
        }

        StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
@@ -179,7 +202,7 @@
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setFullPlt(fullPlt); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
@@ -238,8 +261,19 @@
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        int rowCount = rowLastnoService.selectCount(null);
        Integer integer = 2;
        for (int i = 1; i <= rowCount; i++) {
            integer = rowLastnoService.selectNextWhsType();
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                    .eq("crn_no", integer));
            if (crn_no.getInEnable().equals("Y")
                    && crn_no.getCrnSts() == 3){
                break;
            }
        }
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();