检验任务时间筛选

zss

2025-03-25 7d5f9679128b3084c502b2bf6b076453a439cefc

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

@@ -361,8 +361,12 @@
            } 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("振动")){
            if(filename.toLowerCase().contains(".doc") && sonLaboratory.equals("振动")){
                return docAnalysis(urlString,orderId,sampleId,file.getOriginalFilename());
            }
        } catch (Exception e) {
@@ -421,6 +425,7 @@
            if (orderState.getInsState() == 6) {
                orderState.setInsState(0);
                orderState.setNum(orderState.getNum() + 1);//递增
                orderState.setCreateTime(LocalDateTime.now());
                insOrderStateMapper.updateById(orderState);
            }
        } else {
@@ -936,6 +941,9 @@
                if(tableIndex == 0){
                    Table table = tableList.get(0);
                    for (int i = 0; i < table.numRows(); i++) {
                        if(table.getRow(i).numCells() < 2){
                            continue;
                        }
                        String columnText = ObjectUtils.isEmpty(table.getRow(i).getCell(0))? "" : table.getRow(i).getCell(0).text();
                        String columnValue = ObjectUtils.isEmpty(table.getRow(i).getCell(1))? "" : table.getRow(i).getCell(1).text();
                        if(columnValue.contains("\u0007")){
@@ -958,7 +966,7 @@
                //取第一个表单输入通道参数第一条数据
                if(tableIndex == 1){
                    Table table = tableList.get(1);
                    if(ObjectUtils.isNotEmpty(table)&& table.numRows() > 0){
                    if(ObjectUtils.isNotEmpty(table) && table.numRows() > 1 && table.getRow(1).numCells() >= 3){
                        String columnValue = ObjectUtils.isEmpty(table.getRow(1).getCell(2))? "" : table.getRow(1).getCell(2).text();
                        if(columnValue.contains("\u0007")){
                            columnValue = columnValue.replace("\u0007","");
@@ -970,6 +978,9 @@
                if(tableIndex == tableList.size() - 1){
                    Table table = tableList.get(tableIndex);
                    for (int i = 0; i < table.numRows(); i++) {
                        if(table.getRow(i).numCells() < 2){
                            continue;
                        }
                        String columnText = ObjectUtils.isEmpty(table.getRow(i).getCell(0))? "" : table.getRow(i).getCell(0).text();
                        String columnValue = ObjectUtils.isEmpty(table.getRow(i).getCell(1))? "" : table.getRow(i).getCell(1).text();
                        if(columnValue.contains("\u0007")){
@@ -1200,6 +1211,9 @@
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    createReport(insOrder.getId(),insReportDto1s);
                    //该订单闭环
                    insOrder.setState(4);
                    insOrderMapper.updateById(insOrder);
                    break;
            }
        }
@@ -1287,6 +1301,9 @@
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    createReport(insOrder.getId(),insReportDto1s);
                    //订单闭环
                    insOrder.setState(4);
                    insOrderMapper.updateById(insOrder);
                    break;
            }
        }