Merge remote-tracking branch 'origin/dev' into dev

hongjli

2025-05-22 46090777fa7a6f34701fd3ddf617d815ea5d718f

 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialManagementJobServiceImpl.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.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.IdUtils;
@@ -11,6 +12,7 @@
import com.aps.job.mapper.ApsMaterialManagementJobMapper;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
import com.aps.job.service.IApsMaterialManagementJobService;
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-10
 */
@Service
@Slf4j
public class ApsMaterialManagementJobServiceImpl implements IApsMaterialManagementJobService 
{
    @Autowired
@@ -182,6 +185,7 @@
                        jobLog.setResult("material:"+materialList.size());
                        jobLog.setCreateBy(batchNum);
                        jobLogMapper.insertApsWorkOrderJobLog(jobLog);
                        log.info("物料同步："+ JSON.toJSONString(jobLog));
                        pageIndex++;
                    }else{
                        break;
@@ -196,6 +200,7 @@
                    jobLog.setResult("error");
                    jobLog.setCreateBy(batchNum);
                    jobLogMapper.insertApsWorkOrderJobLog(jobLog);
                    log.info("物料同步："+ JSON.toJSONString(jobLog));
                    break;
                }
            }
@@ -210,6 +215,7 @@
            jobLog.setResult("error");
            jobLog.setCreateBy(batchNum);
            jobLogMapper.insertApsWorkOrderJobLog(jobLog);
            log.info("物料同步："+ JSON.toJSONString(jobLog));
            return false;
        }
        return true;
@@ -219,12 +225,16 @@
    @Override
    public boolean syncApsMaterialDataJob(int pageIndex, int pageSize, String orgCode, String itemCodeList) {
        try {
            log.info("开始清除物料中间表aps_material_management_job");
            apsMaterialManagementJobMapper.deleteApsMaterialJob();
            log.info("开始同步物料信息");
            boolean res = syncApsMaterialData(pageIndex, pageSize, orgCode, itemCodeList);
            if(!res){
                return false;
            }
            log.info("开始清除物料表 aps_material_management");
            apsMaterialManagementJobMapper.deleteApsMaterial();
            log.info("插入数据到 aps_material_management");
            apsMaterialManagementJobMapper.insertIntoApsMaterialManagement();
            return true;
        } catch (Exception e) {