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

zhanghl

2025-05-16 fbb90c31d56348ec3fcc49af49c66b19992f58df

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

@@ -1,5 +1,6 @@
package com.aps.job.service.impl;

import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
@@ -7,6 +8,7 @@
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.domain.ApsWorkOrderProcess;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
import com.aps.job.mapper.ApsWorkOrderJobMapper;
import com.aps.job.mapper.ApsWorkOrderProcessMapper;
import com.aps.job.service.IApsWorkOrderJobLogService;
@@ -53,6 +55,9 @@

    @Autowired
    private IApsWorkOrderJobLogService apsWorkOrderJobLogService;

    @Autowired
    private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;

    /**
     * 查询工单工序
@@ -128,133 +133,157 @@

    @Override
    public void getWorkOrderProcessFromU9(List<String> docNos) throws Exception {
        List<String> noProcessDocNos = new ArrayList<>(docNos);
        List<String> haveProcessDocNos = new ArrayList<>();
        ApsWorkOrderJobLog apsWorkOrderJobLog = new ApsWorkOrderJobLog();
        // 设置请求头
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
        // 设置请求体
        JSONObject requestBody = new JSONObject();
        requestBody.put("DocList", docNos);
        requestBody.put("PageIndex", 1);
        requestBody.put("PageSize", 1000);
        // 创建HttpEntity对象
        HttpEntity<String> request = new HttpEntity<>(requestBody.toJSONString(), headers);
        // 发送POST请求
        ResponseEntity<String> response = restTemplate.postForEntity(u9WorkOrderProcessUrl, request, String.class);
        String responseBody = response.getBody();
        JSONObject responseBodyJson = JSONObject.parseObject(responseBody);
        ApsWorkOrderJobLog apsWorkOrderJobLog = new ApsWorkOrderJobLog();
        apsWorkOrderJobLog.setRequestData(requestBody.toJSONString());
        apsWorkOrderJobLog.setCreateTime(DateUtils.getNowDate());
        apsWorkOrderJobLog.setBizType("work_order_process");
        apsWorkOrderJobLog.setResult("SUCCESS");
        apsWorkOrderJobLogService.insertApsWorkOrderJobLog(apsWorkOrderJobLog);
        List<String> haveProcessDocNos = new ArrayList<>();
        if (response.getStatusCode().is2xxSuccessful()) {
            if(!StringUtils.isEmpty(responseBody)){
                if("200".equals(responseBodyJson.getString("status"))){
                    JSONArray jsonArray = responseBodyJson.getJSONArray("data");
                    if (!jsonArray.isEmpty()) {
                        List<ApsWorkOrderProcess> addList = new ArrayList<>();
                        List<ApsWorkOrderProcess> updateList = new ArrayList<>();
                        String nowDocNo = null;
                        for (Object o : jsonArray) {
                            JSONObject process = (JSONObject) o;
                            if (nowDocNo == null) {
                                nowDocNo = process.getString("DocNo");
                                docNos.remove(nowDocNo);
                                haveProcessDocNos.add(nowDocNo);
        int pageSize = 1000;
        int pageIndex = 1;
        while (true){
            JSONObject requestBody = new JSONObject();
            requestBody.put("DocList", docNos);
            requestBody.put("PageIndex", pageIndex);
            requestBody.put("PageSize", pageSize);
            // 创建HttpEntity对象
            HttpEntity<String> request = new HttpEntity<>(requestBody.toJSONString(), headers);
            // 发送POST请求
            ResponseEntity<String> response = restTemplate.postForEntity(u9WorkOrderProcessUrl, request, String.class);
            String responseBody = response.getBody();
            JSONObject responseBodyJson = JSONObject.parseObject(responseBody);
            apsWorkOrderJobLog.setRequestData(requestBody.toJSONString());
            apsWorkOrderJobLog.setCreateTime(DateUtils.getNowDate());
            apsWorkOrderJobLog.setBizType("work_order_process");
            apsWorkOrderJobLog.setResult("SUCCESS");
            apsWorkOrderJobLogService.insertApsWorkOrderJobLog(apsWorkOrderJobLog);
            if (response.getStatusCode().is2xxSuccessful()) {
                if(!StringUtils.isEmpty(responseBody)){
                    if("200".equals(responseBodyJson.getString("status"))){
                        JSONArray jsonArray = responseBodyJson.getJSONArray("data");
                        if (!jsonArray.isEmpty()) {
                            List<ApsWorkOrderProcess> addList = new ArrayList<>();
                            List<ApsWorkOrderProcess> updateList = new ArrayList<>();
                            String nowDocNo = null;
                            for (int i = 0,size=jsonArray.size();i<size;i++) {
                                JSONObject process = jsonArray.getJSONObject(i);
                                if (nowDocNo == null) {
                                    nowDocNo = process.getString("DocNo");
                                    noProcessDocNos.remove(nowDocNo);
                                    haveProcessDocNos.add(nowDocNo);
                                }
//                                Map<String, Object> params = new HashMap<>();
//                                params.put("docNo", process.getString("DocNo"));
//                                params.put("opNum", process.getString("OpNum"));
//                                params.put("opId", process.getString("OpID"));
//                                Long existsId = apsWorkOrderProcessMapper.existsByDocNoOpNumOpId(params);
                                ApsWorkOrderProcess apsWorkOrderProcess = new ApsWorkOrderProcess();
                                apsWorkOrderProcess.setItemCode(process.getString("ItemCode"));
                                apsWorkOrderProcess.setDocNo(process.getString("DocNo"));
                                apsWorkOrderProcess.setOpNum(process.getString("OpNum"));
                                apsWorkOrderProcess.setOpId(process.getString("OpID"));
                                apsWorkOrderProcess.setProcessName(process.getString("StdOp"));
                                apsWorkOrderProcess.setStandardTime(process.getBigDecimal("StandardTime"));
                                apsWorkOrderProcess.setPalnStartDate(process.getDate("PlanStartDate"));
                                apsWorkOrderProcess.setPlanCompleteDate(process.getDate("PlanCompleteDate"));
                                apsWorkOrderProcess.setProcessQty(process.getBigDecimal("ProcessQty"));
                                apsWorkOrderProcess.setScrapQty(process.getBigDecimal("ScrapQty"));
                                apsWorkOrderProcess.setOpStatus(process.getString("OpStatus"));
                                apsWorkOrderProcess.setOrg(process.getString("Org"));
                                apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
                                apsWorkOrderProcess.setWorkCenter(process.getString("WorkCenter"));
//                                if (existsId != null) {
//                                    apsWorkOrderProcess.setId(existsId);
//                                    apsWorkOrderProcess.setUpdateBy("task");
//                                    apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
//                                    updateList.add(apsWorkOrderProcess);
//                                } else {
                                    apsWorkOrderProcess.setId(IdUtil.getSnowflakeNextId());
                                    apsWorkOrderProcess.setCreateBy("task");
                                    apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
                                    addList.add(apsWorkOrderProcess);
//                                }
                                if(!nowDocNo.equals(process.getString("DocNo")) || i==size-1){
                                    //更新工单同步工序状态
                                    noProcessDocNos.remove(nowDocNo);
                                    haveProcessDocNos.add(nowDocNo);
                                    nowDocNo = process.getString("DocNo");
                                }
                            }
                            Map<String, Object> params = new HashMap<>();
                            params.put("docNo", process.getString("DocNo"));
                            params.put("opNum", process.getString("OpNum"));
                            params.put("opId", process.getString("OpID"));
                            Long existsId = apsWorkOrderProcessMapper.existsByDocNoOpNumOpId(params);
                            ApsWorkOrderProcess apsWorkOrderProcess = new ApsWorkOrderProcess();
                            apsWorkOrderProcess.setItemCode(process.getString("ItemCode"));
                            apsWorkOrderProcess.setDocNo(process.getString("DocNo"));
                            apsWorkOrderProcess.setOpNum(process.getString("OpNum"));
                            apsWorkOrderProcess.setOpId(process.getString("OpID"));
                            apsWorkOrderProcess.setProcessName(process.getString("WorkCenter"));
                            apsWorkOrderProcess.setStandardTime(process.getFloat("StandardTime"));
                            apsWorkOrderProcess.setPalnStartDate(process.getDate("PlanStartDate"));
                            apsWorkOrderProcess.setPlanCompleteDate(process.getDate("PlanCompleteDate"));
                            apsWorkOrderProcess.setProcessQty(process.getFloat("ProcessQty"));
                            apsWorkOrderProcess.setScrapQty(process.getFloat("ScrapQty"));
                            apsWorkOrderProcess.setOpStatus(process.getString("OpStatus"));
                            apsWorkOrderProcess.setOrg(process.getString("Org"));
                            apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
                            if (existsId != null) {
                                apsWorkOrderProcess.setId(existsId);
                                apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
                                updateList.add(apsWorkOrderProcess);
                            } else {
                                apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
                                addList.add(apsWorkOrderProcess);
                            if(!updateList.isEmpty()){
                                apsWorkOrderProcessMapper.updateApsWorkOrderProcessBatch(updateList);
                                apsWorkOrderJobLog.setResult("ok update "+updateList.size());
                                apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
                                apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                                logger.info("【UPDATE】获取并更新U9工序成功！【工单号：{}】", docNos);
                            }
                            if(!nowDocNo.equals(process.getString("DocNo"))){
                                //更新工单同步工序状态
                                docNos.remove(nowDocNo);
                                haveProcessDocNos.add(nowDocNo);
                                nowDocNo = process.getString("DocNo");
                            if(!addList.isEmpty()){
                                apsWorkOrderProcessMapper.insertApsWorkOrderProcessBatch(addList);
                                apsWorkOrderJobLog.setResult("ok insert "+updateList.size());
                                apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
                                apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                                logger.info("【INSERT】获取并插入U9工序成功！【工单号：{}】", docNos);
                            }
                        }
                        if(!updateList.isEmpty()){
                            apsWorkOrderProcessMapper.updateApsWorkOrderProcessBatch(updateList);
                            apsWorkOrderJobLog.setResult("ok update "+updateList.size());
                            apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                            logger.info("【UPDATE】获取并更新U9工序成功！【工单号：{}】", docNos);
                        if(jsonArray.size()<1000){
                            break;
                        }
                        if(!addList.isEmpty()){
                            apsWorkOrderProcessMapper.insertApsWorkOrderProcessBatch(addList);
                            apsWorkOrderJobLog.setResult("ok insert "+updateList.size());
                            apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                            logger.info("【INSERT】获取并插入U9工序成功！【工单号：{}】", docNos);
                        }
                        Map<String, Object> param = new HashMap<>();
                        param.put("status", "1");
                        param.put("docNos", haveProcessDocNos);
                        apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
                        pageIndex++;
                    }else{
                        apsWorkOrderJobLog.setResponseData(response.getBody());
                        apsWorkOrderJobLog.setResult("fail");
                        apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
                        apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                        logger.error("【ERROR】查询U9工序失败！【工单号：{}, 错误码：{}，错误信息：{}】", docNos, responseBodyJson.getString("status"), responseBodyJson.getString("message"));
                    }
                    Map<String, Object> param = new HashMap<>();
                    param.put("status", "2");
                    param.put("docNos", docNos);
                    apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
                }else{
                    apsWorkOrderJobLog.setResponseData(response.getBody());
                    apsWorkOrderJobLog.setResult("fail");
                    apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                    logger.error("【ERROR】查询U9工序失败！【工单号：{}, 错误码：{}，错误信息：{}】", docNos, responseBodyJson.getString("status"), responseBodyJson.getString("message"));
                    logger.warn("【WARNING】未查询到U9工序！【工单号：{}】", docNos);
                }
            }else{
                logger.warn("【WARNING】未查询到U9工序！【工单号：{}】", docNos);
            } else {
                apsWorkOrderJobLog.setResponseData(response.getBody());
                apsWorkOrderJobLog.setResult("fail");
                apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
                apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                throw new Exception("【ERROR】查询U9工序失败！【工单号：{"+ docNos +"}, 错误码：{"+ responseBodyJson.getString("status") +"}，错误信息：{"+ responseBodyJson.getString("message") +"}】");
            }
        } else {
            apsWorkOrderJobLog.setResponseData(response.getBody());
            apsWorkOrderJobLog.setResult("fail");
        }
        if(!haveProcessDocNos.isEmpty()){
            Map<String, Object> param = new HashMap<>();
            param.put("status", "1");
            param.put("docNos", haveProcessDocNos);
            apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
        }
        if(!noProcessDocNos.isEmpty()){
            Map<String, Object> param = new HashMap<>();
            param.put("status", "2");
            param.put("docNos", noProcessDocNos);
            apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
            apsWorkOrderJobLog.setRequestData(noProcessDocNos.toString());
            apsWorkOrderJobLog.setResponseData("");
            apsWorkOrderJobLog.setResult("empty");
            apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
            apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
            throw new Exception("【ERROR】查询U9工序失败！【工单号：{"+ docNos +"}, 错误码：{"+ responseBodyJson.getString("status") +"}，错误信息：{"+ responseBodyJson.getString("message") +"}】");
        }
    }

    @Override
    public void syncWorkOrderProcessData(String status, Integer pageSize) {
        try{
            Integer pageNum = 1;
            //分页查询工单
            ApsWorkOrderJob apsWorkOrderJob = new ApsWorkOrderJob();
            if(status==null){
            if("".equals(status)){
                status = "0";
            }
            if(pageSize==null){
                pageSize = 100;
            }
            apsWorkOrderJob.setProcessStatus(status);
            // 补查之前没有查到工序的工单
            if("2".equals(status)){
                int total = apsWorkOrderJobMapper.selectApsWorkOrderJobList(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);
                    PageHelper.clearPage();
                    if(!pageList.isEmpty()){
                        long startTime = System.currentTimeMillis();
                        List<String> docNos = new ArrayList<>();
@@ -262,28 +291,35 @@
                            docNos.add(apsWorkOrderJob1.getDocNo());
                        }
                        getWorkOrderProcessFromU9(docNos);
                        long endTime = System.currentTimeMillis(); // 记录结束时间
                        long duration = endTime - startTime; // 计算运行时间
                        System.out.println("运行时间："+ duration +"毫秒");
                        if(String.join(",", docNos).equals(lastDocNos)){
                            break;
                        }
                        lastDocNos = String.join(",", docNos);
                    }
                    pageNum++;
                }
            }else{
                while (true){
                    PageHelper.startPage(1, pageSize);
                    List<ApsWorkOrderJob> pageList = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob);
                    PageHelper.clearPage();
                    if(!pageList.isEmpty()){
                        long startTime = System.currentTimeMillis();
                        List<String> docNos = new ArrayList<>();
                        for (ApsWorkOrderJob apsWorkOrderJob1 : pageList){
                            docNos.add(apsWorkOrderJob1.getDocNo());
                            if(apsWorkOrderJob1.getDocNo()!=null){
                                docNos.add(apsWorkOrderJob1.getDocNo());
                            }
                        }
                        getWorkOrderProcessFromU9(docNos);
                        long endTime = System.currentTimeMillis(); // 记录结束时间
                        long duration = endTime - startTime; // 计算运行时间
                        System.out.println("运行时间："+ duration +"毫秒");
                        if(!docNos.isEmpty()){
                            getWorkOrderProcessFromU9(docNos);
                        }else{
                            break;
                        }
                    }else{
                        break;
                    }
                    pageNum++;
                }
            }
        }catch (Exception e){
@@ -301,4 +337,37 @@
    public void deleteApsProcessRoute() {
        apsWorkOrderProcessMapper.deleteApsProcessRoute();
    }

    @Override
    public boolean retryRequestWorkOrderProcessByLogId(Long id) {
        try {
            ApsWorkOrderJobLog apsWorkOrderJobLog = apsWorkOrderJobLogMapper.selectApsWorkOrderJobLogById(id);
            JSONObject requestBodyJson = JSONObject.parseObject(apsWorkOrderJobLog.getRequestData());
            JSONArray docListArray = requestBodyJson.getJSONArray("DocList");
            List<String> docNos = new ArrayList<>();
            for (int i = 0; i < docListArray.size(); i++) {
                if(docListArray.getString(i)!=null){
                    docNos.add(docListArray.getString(i));
                }
            }
            if(!docNos.isEmpty()){
                getWorkOrderProcessFromU9(docNos);
            }
        }catch (Exception e){
            e.printStackTrace();
            return false;
        }
        return true;
    }

    @Override
    public void syncProcessRouteData() {
        apsWorkOrderProcessMapper.deleteApsProcessRoute();
        apsWorkOrderProcessMapper.insertIntoApsProcessRoute();
    }

    @Override
    public void deleteApsWorkOrderProcess() {
        apsWorkOrderProcessMapper.deleteApsWorkOrderProcess();
    }
}