huangjiayang
2025-04-21 1a6dcb56ace7871b56ac68ac87d92fdf7f599d34
【UPDATE】根据日志id同步工序信息接口
已修改3个文件
40 ■■■■■ 文件已修改
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobLogController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobLogController.java
@@ -9,6 +9,7 @@
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.service.IApsWorkOrderJobLogService;
import com.aps.job.service.IApsWorkOrderProcessService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +27,9 @@
public class ApsWorkOrderJobLogController extends BaseController {
    @Autowired
    private IApsWorkOrderJobLogService apsWorkOrderJobLogService;
    @Autowired
    private IApsWorkOrderProcessService iApsWorkOrderProcessService;
    /**
     * 查询工单同步日志列表
@@ -70,4 +74,11 @@
        return toAjax(true);
    }
    @RequiresPermissions("apsWorkOrderJobLog:edit")
    @Log(title = "工单工序同步日志", businessType = BusinessType.UPDATE)
    @PostMapping("/syncProcessByLog")
    public AjaxResult retryRequestWorkOrderProcessByLogId(@RequestBody ApsWorkOrderJobLog apsWorkOrderJobLog) {
        return toAjax(iApsWorkOrderProcessService.retryRequestWorkOrderProcessByLogId(apsWorkOrderJobLog.getId()));
    }
}
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
@@ -81,4 +81,11 @@
     * 删除临时工序数据
     */
    public void deleteApsProcessRoute();
    /**
     * 重试请求工单工序
     * @param id
     * @return true/false
     */
    boolean retryRequestWorkOrderProcessByLogId(Long id);
}
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
@@ -7,6 +7,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 +54,9 @@
    @Autowired
    private IApsWorkOrderJobLogService apsWorkOrderJobLogService;
    @Autowired
    private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;
    /**
     * 查询工单工序
@@ -301,4 +305,22 @@
    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++) {
                docNos.add(docListArray.getString(i));
            }
            getWorkOrderProcessFromU9(docNos);
        }catch (Exception e){
            e.printStackTrace();
            return false;
        }
        return true;
    }
}