can not scan other material

Fancy

2024-07-15 708c924017f21d789849507d386330f71a3b82b4

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java

@@ -145,7 +145,7 @@
        });

        if (deviceList.isEmpty()) {
            throw new RuntimeException("设备号(" + params.deviceNo + ")均不属于当前任务计划");
            throw new RuntimeException("设备号(" + Arrays.toString(params.deviceNo) + ")均不属于当前任务计划");
        }
        if (deviceList.size() > 1) {
            throw new RuntimeException("设备号有且只能有一个属于当前任务计划");
@@ -198,7 +198,10 @@
        if (preRecord != null) {
            record.id = preRecord.id;
            record.inTime = preRecord.outTime;
            record.outLineTime = preRecord.outLineTime;
        }else{
            record.inTime = new Date();
            record.inLineTime = new Date();
            assemblyPlan.setInputNumber(assemblyPlan.getInputNumber() + 1);
        }
        record.outTime = new Date();
@@ -218,7 +221,8 @@
        if (node.isRecord) {
            record.deviceCycleContent = node.deviceCycleContent;
        }
        if(node.getIsEnd()){
        if(node.getIsEnd() && record.outLineTime == null){
            record.outLineTime = new Date();
            assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
        }
        assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
@@ -415,14 +419,17 @@
    public Map<String,String> queryByDeviceNo(String deviceNo) {
        Map<String,String> map = new HashMap<>();
        map.put("deviceNo", deviceNo);
        map.put("proName", "-");
        map.put("proType", "-");
        map.put("proName", "");
        map.put("proType", "");

        PltProduct product = productDao.selectByCode(deviceNo.substring(3,6));
        if(product != null){
            map.put("proName", product.getName());
            map.put("proType", product.getType());
        }
        /*else{
            throw new RuntimeException("该编码("+deviceNo +")不是主要物料(系统中管控的其他设备)");
        }*/
        return map;
    }