aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java

@@ -64,7 +64,7 @@
     * @param orgCode
     * @return
     */
    @PostMapping("refreshBomPrcessrouteStorageData")
    @PostMapping("/refreshBomRouteStorageData")
    public AjaxResult refreshBomRouteStorageData(String orgCode)
    {
        try {

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java

@@ -60,6 +60,7 @@
    /** 计划ID */
    @Excel(name = "计划ID")
    @Schema(description = "计划ID")
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private Long planId;

    public void setType(String type) 

 aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderProcessMapper.java

@@ -94,4 +94,9 @@
     * 删除临时工序数据
     */
    public void deleteApsProcessRoute();

    /**
     * 删除工序中间表数据
     */
    void deleteApsWorkOrderProcess();
}

 aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java

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

import com.aps.job.domain.ApsWorkOrderProcess;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@@ -90,6 +89,14 @@
     */
    boolean retryRequestWorkOrderProcessByLogId(Long id);

    @Transactional
    /**
     * 同步工序数据到业务表中
     */
    void syncProcessRouteData();

    /**
     * 删除工序中间表数据
     */
    void deleteApsWorkOrderProcess();

}

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

@@ -133,6 +133,7 @@

    @Override
    public void getWorkOrderProcessFromU9(List<String> docNos) throws Exception {
        List<String> noProcessDocNos = docNos;
        // 设置请求头
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
@@ -169,14 +170,14 @@
                                JSONObject process = (JSONObject) o;
                                if (nowDocNo == null) {
                                    nowDocNo = process.getString("DocNo");
                                    docNos.remove(nowDocNo);
                                    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);
//                                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"));
@@ -192,17 +193,17 @@
                                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 {
//                                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"))){
                                    //更新工单同步工序状态
                                    docNos.remove(nowDocNo);
@@ -229,10 +230,10 @@
                            param.put("docNos", haveProcessDocNos);
                            apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
                        }else{
                            if(!docNos.isEmpty()){
                            if(!noProcessDocNos.isEmpty()){
                                Map<String, Object> param = new HashMap<>();
                                param.put("status", "2");
                                param.put("docNos", docNos);
                                param.put("docNos", noProcessDocNos);
                                apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
                                apsWorkOrderJobLog.setRequestData(requestBody.toJSONString());
                                apsWorkOrderJobLog.setResponseData(response.getBody());
@@ -365,4 +366,9 @@
        apsWorkOrderProcessMapper.deleteApsProcessRoute();
        apsWorkOrderProcessMapper.insertIntoApsProcessRoute();
    }

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

 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;
@@ -61,9 +62,12 @@
    /**
     * 同步工单工序数据
     */
    @Transactional(rollbackFor = Exception.class)
    public void syncWorkOrderProcessData(String status, Integer pageSize)
    {
        iApsWorkOrderProcessService.deleteApsWorkOrderProcess();
        iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
        iApsWorkOrderProcessService.syncProcessRouteData();
    }

    /**

 aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml

@@ -245,6 +245,11 @@
    </insert>

    <!-- 删除 aps_process_route 表中的数据 -->
    <delete id="deleteApsWorkOrderProcess">
        DELETE FROM aps_work_order_process
    </delete>

    <!-- 删除 aps_process_route 表中的数据 -->
    <delete id="deleteApsProcessRoute">
        DELETE FROM aps_process_route
    </delete>