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

hongjli

2025-05-21 62884ade67353daa3819451f2c8bd2c54d5fd3b0

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

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

@@ -23,6 +23,7 @@
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;

import java.util.ArrayList;
@@ -131,6 +132,7 @@
        return apsWorkOrderProcessMapper.deleteApsWorkOrderProcessById(id);
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public void getWorkOrderProcessFromU9(List<String> docNos) throws Exception {
        List<String> noProcessDocNos = new ArrayList<>(docNos);

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

@@ -65,7 +65,7 @@
    /**
     * 同步工单工序数据
     */
    @Transactional(rollbackFor = Exception.class)

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