From 46090777fa7a6f34701fd3ddf617d815ea5d718f Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 16:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java
index 5f71212..2906f0c 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
import com.aps.common.core.constant.SecurityConstants;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
@@ -15,6 +16,7 @@
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
import com.aps.job.service.IApsBomHeaderJobService;
import com.aps.system.api.RemoteCoreService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
@@ -35,6 +37,7 @@
* @date 2025-05-08
*/
@Service
+@Slf4j
public class ApsBomHeaderJobServiceImpl implements IApsBomHeaderJobService
{
@Autowired
@@ -213,6 +216,8 @@
jobLog.setResult("header:"+headerList.size() + " line:"+lineList.size());
jobLog.setCreateBy(batchNum);
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("BOM鍚屾锛�"+ JSON.toJSONString(jobLog));
+
pageIndex++;
}else{
break;
@@ -227,6 +232,7 @@
jobLog.setResult("error");
jobLog.setCreateBy(batchNum);
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("BOM鍚屾锛�"+ JSON.toJSONString(jobLog));
break;
}
}
@@ -241,6 +247,7 @@
jobLog.setResult("error");
jobLog.setCreateBy(batchNum);
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("BOM鍚屾寮傚父淇℃伅锛�"+ JSON.toJSONString(jobLog));
return false;
}
return true;
@@ -258,16 +265,24 @@
@Override
public boolean syncBomDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList){
try {
+ log.info("鍏ㄩ噺鍚屾BOM鏁版嵁瀹氭椂浠诲姟寮�濮�");
+ log.info(" DELETE FROM aps_bom_header_job");
apsBomHeaderJobMapper.deleteApsBomHeaderJob();
+ log.info(" DELETE FROM aps_bom_line_job");
apsBomLineJobMapper.deleteApsBomLineJob();
boolean res = syncBomData(pageIndex, pageSize, orgCode, itemCodeList);
if(!res){
return false;
}
+ log.info("灏咮OM鍚屾鍒癛edis");
remoteCoreService.setBomDataToRedis(SecurityConstants.INNER);
+ log.info("deleteApsBomHeader");
apsBomHeaderJobMapper.deleteApsBomHeader();
+ log.info("deleteApsBomLine");
apsBomLineJobMapper.deleteApsBomLine();
+ log.info("insertIntoApsBomHeader");
apsBomHeaderJobMapper.insertIntoApsBomHeader();
+ log.info("insertIntoApsBomLine");
apsBomLineJobMapper.insertIntoApsBomLine();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3