Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-30 5da04bc2d5a1c02af3cde063d21101202e10ea24

Merge remote-tracking branch 'origin/dev' into dev

 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java

@@ -277,10 +277,9 @@
            apsWorkOrderJob.setProcessStatus(status);
            // 补查之前没有查到工序的工单
            if("2".equals(status)){
                int total = apsWorkOrderJobMapper.selectApsWorkOrderJobListDocNoNotNull(apsWorkOrderJob).size();
                int pages = total % pageSize == 0 ? total / pageSize : total / pageSize + 1;
                for (int i = 1; i <= pages; i++){
                    PageHelper.startPage(i, pageSize);
                String lastDocNos = "";
                while (true){
                    PageHelper.startPage(1, pageSize);
                    List<ApsWorkOrderJob> pageList = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob);
                    if(!pageList.isEmpty()){
                        long startTime = System.currentTimeMillis();
@@ -289,6 +288,10 @@
                            docNos.add(apsWorkOrderJob1.getDocNo());
                        }
                        getWorkOrderProcessFromU9(docNos);
                        if(String.join(",", docNos).equals(lastDocNos)){
                            break;
                        }
                        lastDocNos = String.join(",", docNos);
                        long endTime = System.currentTimeMillis(); // 记录结束时间
                        long duration = endTime - startTime; // 计算运行时间
                        System.out.println("运行时间："+ duration +"毫秒");