From 0402323943cdcb1a04b81968a7ac52a8915dd02f Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 21:57:40 +0800
Subject: [PATCH] 优化common中Sequence

---
 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 a847e60..e6fd750 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
@@ -12,6 +12,7 @@
 import com.aps.job.mapper.ApsWorkOrderProcessMapper;
 import com.aps.job.service.IApsWorkOrderJobLogService;
 import com.aps.job.service.IApsWorkOrderProcessService;
+import com.aps.common.core.utils.uuid.Sequence;
 import com.github.pagehelper.PageHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,6 +58,9 @@
 
     @Autowired
     private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;
+
+    @Autowired
+    private Sequence sequence;
 
     /**
      * 鏌ヨ宸ュ崟宸ュ簭
@@ -178,7 +182,7 @@
                             apsWorkOrderProcess.setDocNo(process.getString("DocNo"));
                             apsWorkOrderProcess.setOpNum(process.getString("OpNum"));
                             apsWorkOrderProcess.setOpId(process.getString("OpID"));
-                            apsWorkOrderProcess.setProcessName(process.getString("WorkCenter"));
+                            apsWorkOrderProcess.setProcessName(process.getString("StdOp"));
                             apsWorkOrderProcess.setStandardTime(process.getFloat("StandardTime"));
                             apsWorkOrderProcess.setPalnStartDate(process.getDate("PlanStartDate"));
                             apsWorkOrderProcess.setPlanCompleteDate(process.getDate("PlanCompleteDate"));
@@ -187,11 +191,15 @@
                             apsWorkOrderProcess.setOpStatus(process.getString("OpStatus"));
                             apsWorkOrderProcess.setOrg(process.getString("Org"));
                             apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
+                            apsWorkOrderProcess.setWorkCenter(process.getString("WorkCenter"));
                             if (existsId != null) {
                                 apsWorkOrderProcess.setId(existsId);
+                                apsWorkOrderProcess.setUpdateBy("task");
                                 apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
                                 updateList.add(apsWorkOrderProcess);
                             } else {
+                                apsWorkOrderProcess.setId(sequence.nextId());
+                                apsWorkOrderProcess.setCreateBy("task");
                                 apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
                                 addList.add(apsWorkOrderProcess);
                             }

--
Gitblit v1.9.3