From 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 13:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 3 ++-
1 files changed, 2 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..1a8a684 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
@@ -178,7 +178,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,6 +187,7 @@
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.setUpdateTime(DateUtils.getNowDate());
--
Gitblit v1.9.3