From 95b57803f23c999e612547302e18e905a94241be Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 21:56:35 +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 | 4 +++-
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml | 24 ++++++++++++++++++++----
2 files changed, 23 insertions(+), 5 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 3f5ef60..d506401 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
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
-import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.domain.ApsWorkOrderProcess;
@@ -13,6 +12,7 @@
import com.aps.job.mapper.ApsWorkOrderProcessMapper;
import com.aps.job.service.IApsWorkOrderJobLogService;
import com.aps.job.service.IApsWorkOrderProcessService;
+import com.aps.job.util.Sequence;
import com.github.pagehelper.PageHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -194,10 +194,12 @@
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);
}
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
index 9565f61..55d4621 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
@@ -20,10 +20,14 @@
<result property="org" column="org" />
<result property="org_code" column="org_code" />
<result property="work_center" column="workCenter" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectApsWorkOrderProcessVo">
- select id, item_code, doc_no, op_num, op_id, process_name, standard_time, paln_start_date, plan_complete_date, process_qty, scrap_qty, op_status, org, org_code, work_center from aps_work_order_process
+ select id, item_code, doc_no, op_num, op_id, process_name, standard_time, paln_start_date, plan_complete_date, process_qty, scrap_qty, op_status, org, org_code, work_center, create_by, create_time, update_by, update_time from aps_work_order_process
</sql>
<select id="selectApsWorkOrderProcessList" parameterType="ApsWorkOrderProcess" resultMap="ApsWorkOrderProcessResult">
@@ -69,6 +73,8 @@
<if test="org != null">org,</if>
<if test="orgCode != null">org_code,</if>
<if test="workCenter != null">work_center,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -86,6 +92,8 @@
<if test="org != null">#{org},</if>
<if test="orgCode != null">#{orgCode},</if>
<if test="workCenter != null">#{work_center},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
</trim>
</insert>
@@ -106,6 +114,8 @@
<if test="org != null">org = #{org},</if>
<if test="orgCode != null">org_code = #{orgCode},</if>
<if test="workCenter != null">work_center = #{workCenter},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
@@ -144,7 +154,9 @@
op_status = #{item.opStatus},
org = #{item.org},
org_code = #{item.orgCode},
- work_center = #{item.workCenter}
+ work_center = #{item.workCenter},
+ update_by = #{item.updateBy},
+ update_time = #{item.updateTime}
WHERE id = #{item.id}
</foreach>
</update>
@@ -164,7 +176,9 @@
op_status,
org,
org_code,
- work_center
+ work_center,
+ create_by,
+ create_time
) VALUES
<foreach collection="list" item="item" separator=",">
(
@@ -181,7 +195,9 @@
#{item.opStatus},
#{item.org},
#{item.orgCode},
- #{item.workCenter}
+ #{item.workCenter},
+ #{item.createBy},
+ #{item.createTime}
)
</foreach>
</insert>
--
Gitblit v1.9.3