From 9abf3d239625426e2664f6dfc3a4bd40247a8d0d Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 16 七月 2024 09:08:52 +0800
Subject: [PATCH] add workid in history
---
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml | 15 +++++++++++----
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java | 8 ++++++++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 1 +
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java
index 5d09e91..47e8cb5 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java
@@ -28,6 +28,14 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long id;
+
+ /**
+ * 鐢ㄦ埛瀹炰綋缂栧彿
+ */
+ @NotNull(message="[鐢ㄦ埛鐧诲綍缂栧彿]涓嶈兘涓虹┖")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long workId;
+
/**
* 鐢ㄦ埛瀹炰綋缂栧彿
*/
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
index f428bda..bc06a52 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
<id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="workId" column="work_id" jdbcType="BIGINT"/>
<result property="userId" column="user_id" jdbcType="BIGINT"/>
<result property="lineId" column="line_id" jdbcType="BIGINT"/>
<result property="stationId" column="station_id" jdbcType="BIGINT"/>
@@ -20,7 +21,7 @@
</resultMap>
<sql id="Base_Column_List">
- id,user_id,line_id,
+ id,work_id,user_id,line_id,
station_id,plan_id,process_id,
node_id,dt,status,
start_time,end_time,assistants
@@ -39,12 +40,12 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
insert into sta_assembly_work_history
- ( id,user_id,line_id
+ ( id,work_id,user_id,line_id
,station_id,plan_id,process_id
,node_id,dt,status
,start_time,end_time,assistants
)
- values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
+ values (#{id,jdbcType=BIGINT},#{workId,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
,#{stationId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{processId,jdbcType=BIGINT}
,#{nodeId,jdbcType=BIGINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
@@ -54,6 +55,7 @@
insert into sta_assembly_work_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
+ <if test="workId != null">work_id,</if>
<if test="userId != null">user_id,</if>
<if test="lineId != null">line_id,</if>
<if test="stationId != null">station_id,</if>
@@ -68,6 +70,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="userId != null">#{userId,jdbcType=BIGINT},</if>
<if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
@@ -84,6 +87,9 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
update sta_assembly_work_history
<set>
+ <if test="workId != null">
+ work_id = #{workId,jdbcType=BIGINT},
+ </if>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
</if>
@@ -122,7 +128,8 @@
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
update sta_assembly_work_history
- set
+ set
+ work_id = #{workId,jdbcType=BIGINT},
user_id = #{userId,jdbcType=BIGINT},
line_id = #{lineId,jdbcType=BIGINT},
station_id = #{stationId,jdbcType=BIGINT},
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index 0b0a0cb..c995cd0 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -326,6 +326,7 @@
// 淇濆瓨history
StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
BeanUtils.copyProperties(workLast, history);
+ history.setWorkId(workLast.getId());
//history.setId(null);
int count = assemblyWorkHistoryDao.insertSelective(history);
//鍒犻櫎last
--
Gitblit v1.8.0