From 623397a394196189057db9c1948fe3b24f7fa4e3 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 24 七月 2024 15:34:14 +0800
Subject: [PATCH] 生产线和工站添加启用禁用的校验
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 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 fafb322..408f75b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -23,7 +23,7 @@
<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">
+ <resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" 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"/>
@@ -51,11 +51,13 @@
select
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
- sta_device_last t
+ (
+ select <include refid="Base_Column_List" /> from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
+ select <include refid="Base_Column_List" /> from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
+ ) 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.device_no = #{deviceNo,jdbcType=VARCHAR}
ORDER BY t.id DESC
</select>
--
Gitblit v1.8.0