From 1a6dcb56ace7871b56ac68ac87d92fdf7f599d34 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 21 四月 2025 17:57:28 +0800
Subject: [PATCH] 【UPDATE】根据日志id同步工序信息接口
---
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java | 7 +++++++
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 22 ++++++++++++++++++++++
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobLogController.java | 11 +++++++++++
3 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobLogController.java b/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobLogController.java
index f255173..7efe87b 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobLogController.java
+++ b/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()));
+ }
+
}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
index 74873dc..0af7fad 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
+++ b/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);
}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
index de015e2..498b29c 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
+++ b/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;
+ }
}
--
Gitblit v1.9.3