From de8ed61b527f4353b98a9b64d5f556cea6f670e7 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 30 四月 2025 10:44:11 +0800
Subject: [PATCH] 【UPDATE】合并定时任务，步零件、钣金、气柜管路的工单数据到业务表中、同步工序数据到工艺路线表中
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
index 23491e0..fc2078b 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -1,9 +1,9 @@
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.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
@@ -52,9 +52,6 @@
@Autowired
private ApsWorkOrderJobLogMapper jobLogMapper;
-
- @Autowired
- private Sequence sequence;
/**
* 鏌ヨ宸ュ崟鍚屾
@@ -162,7 +159,7 @@
param.setDocState(Arrays.asList(0,1,2,4));
param.setBeginDate(yesterdayMidnight.format(formatter));
param.setEndDate(today.format(formatter));
- param.setPageSize(1000);
+ param.setPageSize(100);
while (continueFlag){
param.setPageIndex(currentPage);
continueFlag= batchSaveByPager(param);
@@ -182,6 +179,7 @@
jobLog.setCreateTime(DateUtils.getNowDate());
jobLog.setBizType("work_order");
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("work_order_request锛歿}", JSONObject.toJSONString(jobLog));
return requestOnePage(jobLog);
}
/**
@@ -296,14 +294,15 @@
}
ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
- order.setId(sequence.nextId());
+ order.setId(IdUtil.getSnowflakeNextId());
order.setOrderId(jsonObject.getString("ID"));
order.setCreateTime(DateUtils.getNowDate());
order.setPageIndex(i);
order.setPageNum(pageNum);
order.setDelFlag("0");
order.setProcessStatus("0");
-
+ order.setOpStatus(jsonObject.getString("OpStatus"));
+ order.setNextOpName(jsonObject.getString("NextOpName"));
jobs.add(order);
orderIds.add(order.getOrderId());
} catch (Exception e) {
--
Gitblit v1.9.3