From 1e8e849c1cbd576dde8dc01efc63f80cf602e2eb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 06 七月 2024 10:00:00 +0800
Subject: [PATCH] station name can not have the same name
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index 3ddb7c2..df99ea3 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -7,7 +7,7 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
- <result property="claimId" column="claim_id" jdbcType="BIGINT"/>
+ <result property="workId" column="work_id" jdbcType="BIGINT"/>
<result property="repairId" column="repair_id" jdbcType="BIGINT"/>
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
<result property="stationId" column="station_id" jdbcType="BIGINT"/>
@@ -16,28 +16,47 @@
<result property="equipCycleContent" column="equip_cycle_content" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
- <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
+ <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
<result property="assistants" column="assistants" jdbcType="VARCHAR"/>
<result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
<result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
</resultMap>
+ <resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife" extends="BaseResultMap">
+ <result property="planName" column="plan_name" jdbcType="VARCHAR"/>
+ <result property="stationName" column="station_name" jdbcType="VARCHAR"/>
+ <result property="updateUserName" column="update_user_name" jdbcType="VARCHAR"/>
+ <association property="assistantNames" jdbcType="VARCHAR" column="assistants"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNamesByAssistants" fetchType="eager" />
+ </resultMap>
<sql id="Base_Column_List">
- id,equip_no,claim_id,
+ id,equip_no,work_id,
repair_id,plan_id,station_id,
curr_node,node_content,equip_cycle_content,
status,result,
- error_code,assistants,in_time,
+ error_msg,assistants,in_time,
out_time,updated_by,memo
</sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from sta_device_production_log
where id = #{id,jdbcType=BIGINT}
+ </select>
+ <select id="selectByEquipNo" parameterType="java.lang.String" resultMap="joinResultMap">
+ select
+ t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
+ FROM
+ sta_device_last t
+ left join pr_assembly_plan p on t.plan_id=p.id
+ left join plt_station s on s.id = t.station_id
+ left JOIN ba_user u on u.id=t.updated_by
+ where t.equip_no = #{equipNo,jdbcType=VARCHAR}
+ ORDER BY t.id DESC
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -46,18 +65,18 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
insert into sta_device_production_log
- ( id,equip_no,claim_id
+ ( id,equip_no,work_id
,repair_id,plan_id,station_id
,curr_node,node_content,equip_cycle_content
,status,result
- ,error_code,assistants,in_time
+ ,error_msg,assistants,in_time
,out_time,updated_by,memo
)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{claimId,jdbcType=BIGINT}
+ values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{equipCycleContent,jdbcType=VARCHAR}
- ,#{nextNode,jdbcType=BIGINT},#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
- ,#{errorCode,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
+ ,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
+ ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
)
</insert>
@@ -66,7 +85,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="equipNo != null">equip_no,</if>
- <if test="claimId != null">claim_id,</if>
+ <if test="workId != null">work_id,</if>
<if test="repairId != null">repair_id,</if>
<if test="planId != null">plan_id,</if>
<if test="stationId != null">station_id,</if>
@@ -75,7 +94,7 @@
<if test="equipCycleContent != null">equip_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
- <if test="errorCode != null">error_code,</if>
+ <if test="errorMsg != null">error_msg,</if>
<if test="assistants != null">assistants,</if>
<if test="inTime != null">in_time,</if>
<if test="outTime != null">out_time,</if>
@@ -85,17 +104,16 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
- <if test="claimId != null">#{claimId,jdbcType=BIGINT},</if>
+ <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
<if test="nodeContent != null">#{nodeContent,jdbcType=VARCHAR},</if>
<if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
- <if test="nextNode != null">#{nextNode,jdbcType=BIGINT},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
- <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
+ <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
<if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
@@ -109,8 +127,8 @@
<if test="equipNo != null">
equip_no = #{equipNo,jdbcType=VARCHAR},
</if>
- <if test="claimId != null">
- claim_id = #{claimId,jdbcType=BIGINT},
+ <if test="workId != null">
+ work_id = #{workId,jdbcType=BIGINT},
</if>
<if test="repairId != null">
repair_id = #{repairId,jdbcType=BIGINT},
@@ -136,8 +154,8 @@
<if test="result != null">
result = #{result,jdbcType=TINYINT},
</if>
- <if test="errorCode != null">
- error_code = #{errorCode,jdbcType=VARCHAR},
+ <if test="errorMsg != null">
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
</if>
<if test="assistants != null">
assistants = #{assistants,jdbcType=VARCHAR},
@@ -161,7 +179,7 @@
update sta_device_production_log
set
equip_no = #{equipNo,jdbcType=VARCHAR},
- claim_id = #{claimId,jdbcType=BIGINT},
+ work_id = #{workId,jdbcType=BIGINT},
repair_id = #{repairId,jdbcType=BIGINT},
plan_id = #{planId,jdbcType=BIGINT},
station_id = #{stationId,jdbcType=BIGINT},
@@ -170,7 +188,7 @@
equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
- error_code = #{errorCode,jdbcType=VARCHAR},
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
assistants = #{assistants,jdbcType=VARCHAR},
in_time = #{inTime,jdbcType=TIMESTAMP},
out_time = #{outTime,jdbcType=TIMESTAMP},
--
Gitblit v1.8.0