Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-22 e5a96bc789ca0252e31fd2e01bec5e471a02c0d6

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

@@ -7,6 +7,7 @@
import com.aps.system.api.RemoteCoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -40,6 +41,12 @@
    @Autowired
    private IApsStandardProcessRouteHeaderJobService apsStandardProcessRouteHeaderJobService;

    @Autowired
    private IApsMaterialManagementJobService apsMaterialManagementJobService;
    
    @Autowired
    private IApsWeldSeamStandardJobService apsWeldSeamStandardJobService;

    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
    {
        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -58,9 +65,12 @@
    /**
     * 同步工单工序数据
     */

    public void syncWorkOrderProcessData(String status, Integer pageSize)
    {
        iApsWorkOrderProcessService.deleteApsWorkOrderProcess();
        iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
        iApsWorkOrderProcessService.syncProcessRouteData();
    }

    /**
@@ -116,6 +126,7 @@
    public void syncAllWorkOrder()
    {

        iApsWorkOrderJobService.deleteAllWorkOrderJob();
        boolean continueFlag = true;
        Integer currentPage = 1;
        ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
@@ -163,7 +174,10 @@
     */
    public void syncApsMaterialStorageDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
    {
        apsMaterialStorageManagementJobService.syncApsMaterialStorageDataJob(pageIndex, pageSize, orgCode, itemCodeList);
        boolean res = apsMaterialStorageManagementJobService.syncApsMaterialStorageDataJob(pageIndex, pageSize, orgCode, itemCodeList);
        if(res){
            remoteCoreService.setStorageDataToRedis(SecurityConstants.INNER);
        }
    }

    /**
@@ -172,10 +186,31 @@
    public void syncProcessRouteJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
    {
        boolean res =  apsStandardProcessRouteHeaderJobService.syncProcessRouteDataJob(pageIndex, pageSize, orgCode, itemCodeList);
//        if(res){
//            remoteCoreService.setBomDataToRedis(SecurityConstants.INNER);
//        }
        if(res){
            remoteCoreService.setProcessRouteDataToRedis(SecurityConstants.INNER);
        }
    }

    /**
     * 同步全量物料数据定时任务
     */
    public void syncApsMaterialDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
    {
        apsMaterialManagementJobService.syncApsMaterialDataJob(pageIndex, pageSize, orgCode, itemCodeList);
    }

    /**
     * 刷新钣金子单数据到Redis
     */
    public void setPlateSubPlansToRedis(){
        remoteCoreService.setPlateSubPlansToRedis(SecurityConstants.INNER);
    }
    
    /**
     * 同步物料标准焊缝数据
     */
    public void syncWeldSeamStandardData() {
        apsWeldSeamStandardJobService.syncWeldSeamStandardData();
    }

}