attend user

Fancy

2025-01-07 28f6317f7189d5c4a7e64f57dd6c7fc2011f8632

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

@@ -7,24 +7,32 @@
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
import com.dy.pmsGlobal.daoSta.*;
import com.dy.pmsGlobal.daoTst.TstCommandMapper;
import com.dy.pmsGlobal.dyFile.FileOperate;
import com.dy.pmsGlobal.dyFile.FileRestVo;
import com.dy.pmsGlobal.pojoOth.OthFile;
import com.dy.pmsGlobal.pojoPlt.*;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrBillOfMaterial;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.*;
import com.dy.pmsGlobal.pojoTst.TstCommand;
import com.dy.pmsGlobal.util.DeviceResult;
import com.dy.pmsGlobal.util.DeviceStatus;
import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.UserUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigInteger;
import java.util.*;
import java.util.stream.Collectors;

@Slf4j
@Service
@@ -33,6 +41,7 @@
    private static final String WORK_TYPE_TEST = "2";
    private static final String WORK_TYPE_INSPECTION = "3";
    private static final String WORK_TYPE_REPAIR = "4";
    private static final String WORK_TYPE_OTHER = "5";

    private StaDeviceLastMapper deviceLastDao;
    private StaDeviceLifeMapper deviceLifeDao;
@@ -46,6 +55,7 @@
    private StaRepairInfoMapper repairInfoDao;
    private PltProductQualityInspectionItemsMapper qualityItemsDao;
    private PltProductTestInspectionItemsMapper testItemsDao;
    private TstCommandMapper tstCommandDao;
    private PltProductMapper productDao;
    private PltProParamsMapper paramsDao;
    private PltProductFileMapper productFileDao;
@@ -53,46 +63,57 @@
    private OthFileMapper othFileMapper;
    @Value("${dy.webFile.fmUrl}")
    private String fmUrl;

    @Autowired
    public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
        this.deviceLastDao = deviceLastDao;
    }

    @Autowired
    public void setDeviceLifeDao(StaDeviceLifeMapper deviceLifeDao) {
        this.deviceLifeDao = deviceLifeDao;
    }

    @Autowired
    public void setWipSnExDao(StaWipSnExMapper wipSnExDao) {
        this.wipSnExDao = wipSnExDao;
    }

    @Autowired
    public void setDeviceProductionLogDao(StaDeviceProductionLogMapper deviceProductionLogDao) {
        this.deviceProductionLogDao = deviceProductionLogDao;
    }

    @Autowired
    public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
        this.assemblyWorkLastDao = assemblyWorkLastDao;
    }

    @Autowired
    public void setAssemblyPlanDao(PrAssemblyPlanMapper assemblyPlanDao) {
        this.assemblyPlanDao = assemblyPlanDao;
    }

    @Autowired
    public void setNodeDao(PrProductionNodeMapper nodeDao) {
        this.nodeDao = nodeDao;
    }

    @Autowired
    public void setRepairInfoDao(StaRepairInfoMapper repairInfoDao) {
        this.repairInfoDao = repairInfoDao;
    }

    @Autowired
    public void setQualityItemsDao(PltProductQualityInspectionItemsMapper qualityItemsDao) {
        this.qualityItemsDao = qualityItemsDao;
    }

    @Autowired
    public void setTestItemsDao(PltProductTestInspectionItemsMapper testItemsDao) {
        this.testItemsDao = testItemsDao;
    }

    @Autowired
    public void setProductDao(PltProductMapper productDao) {
        this.productDao = productDao;
@@ -117,9 +138,15 @@
    public void setOthFileMapper(OthFileMapper othFileMapper) {
        this.othFileMapper = othFileMapper;
    }

    @Autowired
    public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
        this.deviceLifeLastDao = deviceLifeLastDao;
    }

    @Autowired
    public void setTstCommandDao(TstCommandMapper tstCommandDao) {
        this.tstCommandDao = tstCommandDao;
    }

    @Transactional
@@ -134,13 +161,17 @@
        Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo));
        // 分类设备号和物料号
        List<String> deviceList = new ArrayList<>();
        List<String> materialList = new ArrayList<>();
        List<Map<String, String>> materialList = new ArrayList<>();
        List<PltProduct> productList = productDao.selectAll(null);
        deviceSet.forEach(device -> {
            if (device.contains(plan.batchNo)) {
                deviceList.add(device);
            } else if(isOurProduct(device,productList)){
                materialList.add(device);
        deviceSet.forEach(deviceNo -> {
            if (deviceNo.contains(plan.batchNo)) {
                deviceList.add(deviceNo);
            } else {
                //判断是不是是本厂物料,如果是,则添加物料到ex表中
                Map<String, String> result = queryByDeviceNo(deviceNo, productList);
                if (StringUtils.isNotBlank(result.get("proName"))) {
                    materialList.add(result);
                }
            }
        });

@@ -148,12 +179,12 @@
            throw new RuntimeException("设备号(" + Arrays.toString(params.deviceNo) + ")均不属于当前任务计划");
        }
        if (deviceList.size() > 1) {
            throw new RuntimeException("设备号有且只能有一个属于当前任务计划");
            throw new RuntimeException("在产设备(" + deviceList.stream().collect(Collectors.joining(",")) + ")有且只能有一个属于当前任务计划");
        }

        StaDeviceLast deviceLast = buildDeviceLast(params, workLast, deviceList.get(0));
        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKeySelective(deviceLast);
                deviceLastDao.updateByPrimaryKey(deviceLast);

        saveDeviceProductionLog(deviceLast);

@@ -162,7 +193,7 @@
            saveDeviceLife(deviceLast);
        }
        if (CollectionUtils.isNotEmpty(materialList)) {
            saveSnEx(workLast, deviceList, materialList, plan);
            saveSnEx(workLast, deviceList, materialList);
        }
        return count;
    }
@@ -184,89 +215,144 @@
        BeanUtils.copyProperties(deviceLast, lastLife);
        lastLife.setId(null);
        int count = deviceLifeLastDao.updateByDeviceNo(lastLife);
        if (count == 0){
        if (count == 0) {
            deviceLifeLastDao.insertSelective(lastLife);
        }
    }

    private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast,String deviceNo) {
    private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast, String deviceNo) {
        //组装数据
        StaDeviceLast record = new StaDeviceLast();
        //pr_assembly_plan input_number +1  投入数加1
        PrAssemblyPlan assemblyPlan = assemblyPlanDao.selectByPrimaryKey(workLast.planId);
        //pr_assembly_plan input_number +1  投入数加1   根据deviceNo 找到对应任务
        PrAssemblyPlan assemblyPlan = queryPlanByDeviceNo(deviceNo); //PrAssemblyPlan assemblyPlan = assemblyPlanDao.selectByPrimaryKey(workLast.planId);
        StaDeviceLast preRecord = deviceLastDao.selectByDeviceNo(deviceNo);
        if (preRecord != null) {
            record.id = preRecord.id;
            record.inTime = preRecord.outTime;
        }else{
            record.inLineTime = preRecord.inLineTime;
            record.outLineTime = preRecord.outLineTime;//下边判断是否结束会用到 得留着
        } else {
            record.inTime = new Date();
            record.inLineTime = new Date();
            assemblyPlan.setInputNumber(assemblyPlan.getInputNumber() + 1);
        }
        record.outTime = new Date();

        record.planId = workLast.planId;
        record.planId = assemblyPlan.getId();
        record.workId = Long.parseLong(params.workId);
        record.stationId = workLast.stationId;
        record.deviceNo = deviceNo;
        record.currNode = workLast.nodeId;

        record.updatedBy = workLast.userId;
        record.assistants = workLast.assistants;
        record.errorMsg = params.errorMsg;

        PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
        record.nodeContent = node.content;
        if (node.isRecord) {
            record.deviceCycleContent = node.deviceCycleContent;
        Boolean isEnd = false;//是否经历过或正在经历结束节点
        if (workLast.nodeId == null) {
            if (record.outLineTime != null) {
                isEnd = true;
            }
            if(StringUtils.isNotBlank(params.getContent())){
                record.nodeContent = params.getContent();
            }
        } else {
            PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
            record.nodeContent = node.content;
            PrProductionNode nextNode = nodeDao.selectNodeBySort(node.getProcessId() , (node.getSort() + 1));
            record.nextNodeContent = nextNode.content;
            record.nextNode = nextNode.id;
            if (node.isRecord) {
                record.deviceCycleContent = node.deviceCycleContent;
            }
            if (node.getIsEnd() && record.outLineTime == null) {
                record.outLineTime = new Date();
                assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
                isEnd = true;
            } else if (record.outLineTime != null) {
                isEnd = true;
            }
        }
        if(node.getIsEnd()){
            assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
        }
        record.status = getStatus(params.status, isEnd, workLast.workType.toString());
        record.result = getResult(params.status, workLast.workType.toString());
        assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
        record.status = getStatus(params.status, node.isEnd,workLast.workType.toString());
        return record;
    }

    private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList, List<String> materialList, PrAssemblyPlan plan) {
        for (String material : materialList) {
    private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList, List<Map<String, String>> materialList) {
        for (Map<String, String> material : materialList) {
            StaWipSnEx snEx = new StaWipSnEx();
            snEx.deviceNo = deviceList.get(0);
            snEx.productId = plan.process.proId;
            snEx.productNo = material;
            snEx.productNo = material.get("deviceNo");
            snEx.productName = material.get("proName");
            snEx.productId = Long.parseLong(material.get("proId"));
            snEx.createTime = workLast.startTime;
            snEx.createBy = workLast.userId;
            snEx.productName = plan.proName;

            wipSnExDao.insertSelective(snEx);
        }
    }

    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     * 原状态: 0:待生产,1:组装中,2:完成,3:维修,4:报废,5:测试不通过,6:品检不通过
     * 20240717当前状态  状态: 1, 组装中,2:完成,3:维修,4:报废
     *
     * @param status    状态
     * @param isEndNode 是否结束节点
     * @param status 状态
     * @param isEnd  是否经历过结束节点
     * @return 状态
     */
    private int getStatus(String status, boolean isEndNode,String workType) {
        //组装,维修
        if (WORK_TYPE_ASSEMBLY.equals(workType)||WORK_TYPE_REPAIR.equals(workType)) {
    private Integer getStatus(String status, boolean isEnd, String workType) {
        //组装   2024/07/17 目前组装workType 1 只有MarkOk     //测试    //品检
        if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_TEST.equals(workType) || WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_REPAIR.equals(workType)|| WORK_TYPE_OTHER.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> isEndNode? DeviceStatus.COMPLETED.getCode(): DeviceStatus.ASSEMBLING.getCode();
                case QrCodeConstant.MarkUnqualified, QrCodeConstant.MarkPreUnqualified -> DeviceStatus.REPAIR.getCode();
                case QrCodeConstant.MarkOk -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
                case QrCodeConstant.MarkQualified -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceStatus.REPAIR.getCode();
                case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
                default -> throw new RuntimeException("状态错误");
            };
        //品检,测试
        }else if(WORK_TYPE_INSPECTION.equals(workType)||WORK_TYPE_TEST.equals(workType)){
        }
        //维修
        throw new RuntimeException("状态错误，无效的节点类型: " + workType);
    }

    /**
     * 结果: 1:通过,2:测试通过,3:品检通过,4:维修通过,5:测试不通过,6:品检不通过,7:报废
     *
     * @param status 前端出来的状态
     * @return 结果
     */
    private Integer getResult(String status, String workType) {
        //组装  临时任务-其他
        if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_OTHER.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceStatus.COMPLETED.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceStatus.TEST_FAILED.getCode();
                case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
                case QrCodeConstant.MarkOk -> DeviceResult.PASS.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //测试
        } else if (WORK_TYPE_TEST.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkQualified -> DeviceResult.TEST_PASS.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceResult.TEST_FAIL.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //品检
        } else if (WORK_TYPE_INSPECTION.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkQualified -> DeviceResult.INSPECTION_PASS.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceResult.INSPECTION_FAIL.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //维修
        } else if (WORK_TYPE_REPAIR.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceResult.REPAIR_PASS.getCode();
                case QrCodeConstant.MarkWaste -> DeviceResult.WASTE.getCode();
                default -> throw new RuntimeException("状态错误");
            };
        }
        throw new RuntimeException("状态错误，无效的节点类型: " + workType);
    }

    @Transactional
    public int repair(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
@@ -280,59 +366,125 @@
        repairInfo.repairTime = new Date();
        repairInfo.repairBy = workLast.userId;
        repairInfo.repairReason = vo.errorMsg;
        repairInfo.fromNode = preDeviceRecord.currNode;
        if (preDeviceRecord != null) {
            repairInfo.fromNode = preDeviceRecord.currNode;
        }
        repairInfoDao.insertSelective(repairInfo);

        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);

        deviceLast.setRepairId(repairInfo.getId());
        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKeySelective(deviceLast);
                deviceLastDao.updateByPrimaryKey(deviceLast);
        saveDeviceProductionLog(deviceLast);
        boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
        if (isEndNode) {
        //只要经历过结束节点,就一直记录device life
        if (preDeviceRecord != null && preDeviceRecord.getOutLineTime() != null) {
            saveDeviceLife(deviceLast);
        }
        return count;
    }

    @Transactional
    public int testing(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
        if (workLast == null) {
            throw new RuntimeException("系统中没有该条登录信息");
        }

        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKeySelective(deviceLast);
                deviceLastDao.updateByPrimaryKey(deviceLast);
        saveDeviceProductionLog(deviceLast);
        PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
        if (node != null && node.isRecord) {
            saveDeviceLife(deviceLast);
        }
        return count;
    }

    @Transactional
    public int inspectQuality(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
        if (workLast == null) {
            throw new RuntimeException("系统中没有该条登录信息");
        }
        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKey(deviceLast);
        saveDeviceProductionLog(deviceLast);
        PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
        if (node != null && node.isRecord) {
            saveDeviceLife(deviceLast);
        }
        return count;
    }

    //无任务计划中的其他 传workId ,手写工作内容 , 数量
    @Transactional
    public int otherWork(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
        if (workLast == null) {
            throw new RuntimeException("系统中没有该条登录信息");
        }
        int count = 0;
        //保存工作记录 //如果有设备码
        if(vo.deviceNo != null && StringUtils.isNotBlank(vo.deviceNo[0])){
            StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
            count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                    deviceLastDao.updateByPrimaryKey(deviceLast);
            saveDeviceProductionLog(deviceLast);
        }else{
            StaDeviceProductionLog log = new StaDeviceProductionLog();
            log.setId(null); // 设备生产日志ID设为null，表示新增
            log.setDeviceNo("");  //RepairId  planId  currNode deviceCycleContent  memo
            log.setWorkId(workId);
            log.setStationId(workLast.getStationId());
            log.setNodeContent(vo.getContent());
            log.setStatus(DeviceStatus.COMPLETED.getCode());//完成状态
            log.setResult(DeviceResult.PASS.getCode());//通过
            log.setErrorMsg(vo.getErrorMsg());
            log.setAssistants(workLast.getAssistants());
            log.setInTime(new Date());
            log.setOutTime(new Date());
            log.setUpdatedBy(workLast.getUserId());
            log.setNumber(vo.getNumber());
            count = deviceProductionLogDao.insertSelective(log);

        }
        return count;
    }

    //根据节点查出节点作业指导书
    public PrProductionNode getSopByNodeId(String nodeId) {
        if(com.alibaba.excel.util.StringUtils.isBlank(nodeId)){
        if (com.alibaba.excel.util.StringUtils.isBlank(nodeId)) {
            throw new RuntimeException("节点ID不能为空");
        }
        PrProductionNode node = nodeDao.selectByPrimaryKey(Long.parseLong(nodeId));
        if(node == null){
        if (node == null) {
            throw new RuntimeException("节点ID不存在,请检查");
        }
        if(node.instruction != null){
        if (node.instruction != null) {
            addUrl(node.instruction);
        }
        return  node;
        if (node.bill != null) {
            addBillUrl(node.bill);
        }
        return node;
    }

    //主要技术参数    俩个方法同 platform-->product-->productSv
    public List<PltProductParams> getParamsByProId(String proId) {
        if(StringUtils.isBlank(proId)){
        if (StringUtils.isBlank(proId)) {
            throw new RuntimeException("产品ID不能为空");
        }
        List<PltProductParams> proParams = paramsDao.selectParams(Long.parseLong(proId));
        return  proParams;
        return proParams;
    }

    // 根据产品查出产品文件
    public List<PltProductFile> getFileByProId(String proId) {
        if(StringUtils.isBlank(proId)){
        if (StringUtils.isBlank(proId)) {
            throw new RuntimeException("产品ID不能为空");
        }
        List<PltProductFile> proFiles = productFileDao.selectDocuments(Long.parseLong(proId));
@@ -342,16 +494,17 @@
                return;
            }
            FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
            doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
            doc.webUrl = fileRestVo.fileWebDownloadPath + doc.fileId;
            doc.orgName = file.orgName;
            doc.extName = file.extName;
        });
        return  proFiles;
        return proFiles;
    }

    public List<PltProductQualityInspectionItems> getQualityItems(String proId) {
        Map<String, Object> params = new HashMap<>();
        params.put("proId", proId);//item  start  count
        params.put("disabled", "0");
        //查询符合条件的记录
        return qualityItemsDao.selectSome(params);
    }
@@ -359,19 +512,21 @@
    public List<PltProductTestInspectionItems> getTestItems(String proId) {
        Map<String, Object> params = new HashMap<>();
        params.put("proId", proId);
        params.put("disabled", "0");
        return testItemsDao.selectSome(params);
    }

    private boolean isOurProduct(String deviceNo, List<PltProduct> products){
        if(StringUtils.isNotEmpty(deviceNo) && deviceNo.length() ==22 ){
            for(PltProduct product:products){
                if(deviceNo.startsWith(QrCodeConstant.TypeProduct + product.getCode())){
    private boolean isOurProduct(String deviceNo, List<PltProduct> products) {
        if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
            for (PltProduct product : products) {
                if (deviceNo.startsWith(QrCodeConstant.TypeProduct + product.getCode())) {
                    return true;
                }
            }
        }
        return false;
    }

    private void addUrl(PrWorkingInstruction ins) {
        if (ins == null || ins.fileId == null) {
            return;
@@ -381,49 +536,78 @@
            return;
        }
        FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
        ins.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + ins.fileId;
        ins.webUrl = fileRestVo.fileWebDownloadPath + ins.fileId;
        ins.orgName = file.orgName;
        ins.extName = file.extName;
    }
    private PltProduct addWebUrl(PltProduct pro) {
        if (pro != null) {
            if (pro.image != null) {
                String filePathWithWebUrl = getFilePathWithWebUrl(pro.image);
                pro.imageWebPath = filePathWithWebUrl;
                pro.imageWebPathZip = fileOperate.getImgFileZipPath(filePathWithWebUrl);
            }

            pro.proFiles.stream().forEach(doc -> {
                OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
                if (file == null) {
                    return;
                }
                FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
                doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
                doc.orgName = file.orgName;
                doc.extName = file.extName;
            });
        }
        return pro;
    }
//    private PltProduct addWebUrl(PltProduct pro) {
//        if (pro != null) {
//            if (pro.image != null) {
//                String filePathWithWebUrl = getFilePathWithWebUrl(pro.image);
//                pro.imageWebPath = filePathWithWebUrl;
//                pro.imageWebPathZip = fileOperate.getImgFileZipPath(filePathWithWebUrl);
//            }
//
//            pro.proFiles.stream().forEach(doc -> {
//                OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
//                if (file == null) {
//                    return;
//                }
//                FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
//                doc.webUrl = fileRestVo.fileWebDownloadPath + doc.fileId;
//                doc.orgName = file.orgName;
//                doc.extName = file.extName;
//            });
//        }
//        return pro;
//    }

    private String getFilePathWithWebUrl(Long fileId) {
        OthFile file = othFileMapper.selectByPrimaryKey(fileId);
        FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
        return fileRestVo.fileWebUrl + file.filePath;
    }

    public Map<String,String> queryByDeviceNo(String deviceNo) {
        Map<String,String> map = new HashMap<>();
    public Map<String, String> queryByDeviceNo(String deviceNo, List<PltProduct> productList) {
        Map<String, String> map = new HashMap<>();
        map.put("deviceNo", deviceNo);
        map.put("proName", "-");
        map.put("proType", "-");

        PltProduct product = productDao.selectByCode(deviceNo.substring(3,6));
        if(product != null){
        map.put("proName", "");
        map.put("proType", "");
        map.put("proId", "");
        map.put("proCode", "");
        //判断是不是是本厂物料
        if (CollectionUtils.isEmpty(productList)) {
            productList = productDao.selectAll(null);
        }
        PltProduct product = null;
        if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
            product = productList.stream().filter(p -> deviceNo.startsWith(QrCodeConstant.TypeProduct + p.getCode())).findFirst().orElse(null);
        }
        if (product != null) {
            map.put("deviceNo", deviceNo);
            map.put("proName", product.getName());
            map.put("proType", product.getType());
            BigInteger proId = BigInteger.valueOf(product.getId());
            map.put("proId", proId.toString());
            map.put("proCode", product.getCode());
        }
        return map;
    }

    //查询产品所在的任务
    public PrAssemblyPlan queryPlanByDeviceNo(String deviceNo) {
        String proCode = "";
        String lotCode = "";
        if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
            proCode = deviceNo.substring(3, 6);
            lotCode = deviceNo.substring(6, 15);
        }
        PrAssemblyPlan plan = assemblyPlanDao.selectByDeviceNo(proCode, lotCode);
        if (plan != null) {
            plan.setBatchNo(lotCode);
        }
        return plan;
    }

    public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
@@ -433,4 +617,28 @@
    public List<StaDeviceProductionLog> queryLogByDeviceNo(String devoiceNo) {
        return deviceProductionLogDao.selectByDeviceNo(devoiceNo);
    }

    private void addBillUrl(PrBillOfMaterial bill) {
        if (bill == null || bill.fileId == null) {
            return;
        }
        OthFile file = othFileMapper.selectByPrimaryKey(bill.fileId);
        if (file == null) {
            return;
        }
        FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
        bill.webUrl = fileRestVo.fileWebDownloadPath + bill.fileId;
        bill.orgName = file.orgName;
        bill.extName = file.extName;
    }
    public List<TstCommand> getCommand(String proId, int type) {
        Map<String, Object> params = new HashMap<>();
        params.put("proId", proId);
        params.put("type", type);
        return tstCommandDao.selectSome(params);
    }
    public List<PltProduct> selectAll(QueryVo queryVo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
        return productDao.selectAll(params);
    }
}