Merge remote-tracking branch 'origin/master'

zss

2025-03-24 17c7e460e0664ef30b34b6a6af8ad72a075d401c

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -361,6 +361,10 @@
            } else if (ObjectUtils.isNotEmpty(sonLaboratory) && sonLaboratory.equals("电路试验") && split[split.length - 1].equals("csv") && insOrder.getSampleType().equals("无源器件")) {
                dianLuUtils.readDianLuFile3(sampleId, insOrderFile);
            }
            // 电路实验返回文件名
            if(ObjectUtils.isNotEmpty(sonLaboratory) && sonLaboratory.equals("电路试验")){
                return pathName;
            }
            // 震动doc文件解析
            if(filename.contains(".doc") && sonLaboratory.equals("振动")){
                return docAnalysis(urlString,orderId,sampleId,file.getOriginalFilename());
@@ -1200,6 +1204,9 @@
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    createReport(insOrder.getId(),insReportDto1s);
                    //该订单闭环
                    insOrder.setState(4);
                    insOrderMapper.updateById(insOrder);
                    break;
            }
        }
@@ -1287,6 +1294,9 @@
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    createReport(insOrder.getId(),insReportDto1s);
                    //订单闭环
                    insOrder.setState(4);
                    insOrderMapper.updateById(insOrder);
                    break;
            }
        }