From e7986ae5cee9034ec03ca6541775f4f7c30de146 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 28 四月 2025 21:20:32 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】修改获取设计产能数BUG
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
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 3aa537d..d8b8a7a 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
@@ -1,10 +1,10 @@
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;
import com.aps.common.core.utils.StringUtils;
-import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.domain.ApsWorkOrderProcess;
@@ -58,9 +58,6 @@
@Autowired
private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;
-
- @Autowired
- private Sequence sequence;
/**
* 鏌ヨ宸ュ崟宸ュ簭
@@ -198,7 +195,7 @@
apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
updateList.add(apsWorkOrderProcess);
} else {
- apsWorkOrderProcess.setId(sequence.nextId());
+ apsWorkOrderProcess.setId(IdUtil.getSnowflakeNextId());
apsWorkOrderProcess.setCreateBy("task");
apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
addList.add(apsWorkOrderProcess);
@@ -213,12 +210,14 @@
if(!updateList.isEmpty()){
apsWorkOrderProcessMapper.updateApsWorkOrderProcessBatch(updateList);
apsWorkOrderJobLog.setResult("ok update "+updateList.size());
+ apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
logger.info("銆怳PDATE銆戣幏鍙栧苟鏇存柊U9宸ュ簭鎴愬姛锛併�愬伐鍗曞彿锛歿}銆�", docNos);
}
if(!addList.isEmpty()){
apsWorkOrderProcessMapper.insertApsWorkOrderProcessBatch(addList);
apsWorkOrderJobLog.setResult("ok insert "+updateList.size());
+ apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
logger.info("銆怚NSERT銆戣幏鍙栧苟鎻掑叆U9宸ュ簭鎴愬姛锛併�愬伐鍗曞彿锛歿}銆�", docNos);
}
@@ -236,6 +235,7 @@
}else{
apsWorkOrderJobLog.setResponseData(response.getBody());
apsWorkOrderJobLog.setResult("fail");
+ apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
logger.error("銆怑RROR銆戞煡璇9宸ュ簭澶辫触锛併�愬伐鍗曞彿锛歿}, 閿欒鐮侊細{}锛岄敊璇俊鎭細{}銆�", docNos, responseBodyJson.getString("status"), responseBodyJson.getString("message"));
}
@@ -245,6 +245,7 @@
} else {
apsWorkOrderJobLog.setResponseData(response.getBody());
apsWorkOrderJobLog.setResult("fail");
+ apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
throw new Exception("銆怑RROR銆戞煡璇9宸ュ簭澶辫触锛併�愬伐鍗曞彿锛歿"+ docNos +"}, 閿欒鐮侊細{"+ responseBodyJson.getString("status") +"}锛岄敊璇俊鎭細{"+ responseBodyJson.getString("message") +"}銆�");
}
--
Gitblit v1.9.3