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

zhanghl

2025-05-12 088a46dc697ef5b719f1ab62c9988f96a21e5e0c

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

@@ -40,6 +40,9 @@
    @Autowired
    private IApsStandardProcessRouteHeaderJobService apsStandardProcessRouteHeaderJobService;

    @Autowired
    private IApsMaterialManagementJobService apsMaterialManagementJobService;

    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
    {
        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -172,9 +175,17 @@
    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);
    }