#自动补空板任务 扫码 实装

LSH

2023-07-25 fabe6cee980f7486d7e8fd374cd3748980f19d6d

 src/main/java/com/zy/common/service/CommonService.java

@@ -88,6 +88,22 @@
        return workNo;
    }

    //拆盘机处空板扫码，驱动托盘向码垛位，不入库
    @Transactional
    public StartupDto getScanBarcodeEmptyBoard(){
        StartupDto startupDto = new StartupDto();
        Integer staNo = 0;
        if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
            staNo=216;
        }
        if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
            staNo=220;
        }

        startupDto.setStaNo(staNo);
        return startupDto;
    }

    /**
     * 检索库位号
     * @param whsType 类型 1:双深式货架
@@ -132,23 +148,9 @@
                        break;
                    }
                }
                String val = String.valueOf(vo.getValue());
                if (Cools.isEmpty(batch)) {
                    batch = val;
                } else {
                    int year0 = Integer.parseInt(batch.substring(0, 2));
                    int month0 = Integer.parseInt(batch.substring(2, 4));
                    int year = Integer.parseInt(val.substring(0, 2));
                    int month = Integer.parseInt(val.substring(2, 4));
                    if (year <= year0) {
                        if (month < month0) {
                            batch = val;
                        }
                    }
                }
            }
            if (sameMatnr) {
                List<String> locNos = locDetlService.getSameDetlToday2(matnr, batch, sRow, eRow);
                List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
                for (String locNo : locNos) {
                    if (Utils.isShallowLoc(slaveProperties, locNo)) {
                        continue;
@@ -291,6 +293,9 @@
                locTypeDto.setLocType1((short) 2);
                return getLocNo(1, staDescId, sourceStaNo, list, locTypeDto, times);
            }
            if (!sign){
                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
            }
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }