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

zhanghl

2025-04-28 d668c213bbcccd83acb57056a6b7919fda7e6d2d

 aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java

@@ -45,24 +45,39 @@
    /**
     * 同步工单工序数据
     */
    public void syncWorkOrderProcessData()
    public void syncWorkOrderProcessData(String status, Integer pageSize)
    {
        iApsWorkOrderProcessService.syncWorkOrderProcessData();
        iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
    }

    /**
     * 每日同步零件工单数据
     * */
    public void  syncPartOrderData ()
    {

        iApsWorkOrderJobService.syncPartOrderData();
    }

    /**
     * 每日同步钣金工单数据
     * */
    public void  syncPlateOrderData ()
    {

        iApsWorkOrderJobService.syncPlateOrderData();
    }
    /**
     * 每日同步气柜管路数据
     * */
    public void  syncGasPipingData ()
    {
        iApsWorkOrderJobService.syncGasPipingData();
    }
    /**
     * 每日同步所有工单数据
     * */
    public void syncWorkOrderData()
    {

        iApsWorkOrderJobService.SyncWorkOrderByTime();
    }

    /**
     * 每日同步零件工单数据
     * */
    public void syncPartOrderData()
    {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime today = LocalDateTime.now();
@@ -75,14 +90,31 @@
        param.setDocState(Arrays.asList(0,1,2,4));
        param.setBeginDate(yesterdayMidnight.format(formatter));
        param.setEndDate(today.format(formatter));
        param.setPageSize(1000);
        param.setPageSize(500);
        while (continueFlag){
            param.setPageIndex(currentPage);
            continueFlag= iApsWorkOrderJobService.batchSaveByPager(param);
            currentPage++;
        }
    }
    /**
     * 每日同步所有工单数据
     * */
    public void syncAllWorkOrder()
    {

        boolean continueFlag = true;
        Integer currentPage = 1;
        ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
        param.setPageIndex(currentPage);
        param.setDocState(Arrays.asList(0,1,2,4));
        param.setPageSize(500);
        while (continueFlag){
            param.setPageIndex(currentPage);
            continueFlag= iApsWorkOrderJobService.batchSaveByPager(param);
            currentPage++;
        }
    }
    /**
     * 将工单工序数据同步到业务表中
     */