From e5a96bc789ca0252e31fd2e01bec5e471a02c0d6 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 22 五月 2025 17:57:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java
index 8999522..10e1953 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java
@@ -1,6 +1,7 @@
package com.aps.job.service.impl;
import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
@@ -11,6 +12,7 @@
import com.aps.job.mapper.ApsMaterialStorageManagementJobMapper;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
import com.aps.job.service.IApsMaterialStorageManagementJobService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
@@ -31,6 +33,7 @@
* @date 2025-05-08
*/
@Service
+@Slf4j
public class ApsMaterialStorageManagementJobServiceImpl implements IApsMaterialStorageManagementJobService
{
@Autowired
@@ -174,6 +177,7 @@
jobLog.setResult("storage:"+storageList.size());
jobLog.setCreateBy(batchNum);
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("鐗╂枡鍚屾锛�"+ JSON.toJSONString(jobLog));
pageIndex++;
}else{
break;
@@ -188,6 +192,7 @@
jobLog.setResult("error");
jobLog.setCreateBy(batchNum);
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("鐗╂枡鍚屾寮傚父锛�"+ JSON.toJSONString(jobLog));
break;
}
}
@@ -202,6 +207,7 @@
jobLog.setResult("error");
jobLog.setCreateBy(batchNum);
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("鐗╂枡鍚屾寮傚父锛�"+ JSON.toJSONString(jobLog));
return false;
}
return true;
@@ -211,12 +217,17 @@
@Override
public boolean syncApsMaterialStorageDataJob(int pageIndex, int pageSize, String orgCode, String itemCodeList) {
try {
+ log.info("寮�濮嬪悓姝ュ簱瀛樻暟鎹�");
+ log.info("delete ApsMaterialStorageJob");
apsMaterialStorageManagementJobMapper.deleteApsMaterialStorageJob();
+ log.info("sync ApsMaterialStorageData");
boolean res = syncApsMaterialStorageData(pageIndex, pageSize, orgCode, itemCodeList);
if(!res){
return false;
}
+ log.info("delete ApsMaterialStorage");
apsMaterialStorageManagementJobMapper.deleteApsMaterialStorage();
+ log.info("insertInto ApsMaterialStorage ");
apsMaterialStorageManagementJobMapper.insertIntoApsMaterialStorage();
return true;
} catch (Exception e) {
--
Gitblit v1.9.3