From 3c61c5f4bc92f75b4fe60653eaa676a21cde4325 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 19 十二月 2024 17:09:02 +0800
Subject: [PATCH] edit BI Device log and planList
---
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
index cc8617e..f5c4ff1 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
@@ -27,10 +27,15 @@
where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectByDeviceNo" resultType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
- select
+ SELECT
<include refid="Base_Column_List" />
- from sta_wip_sn_ex
- where device_no = #{deviceNo,jdbcType=VARCHAR}
+ FROM (
+ SELECT
+ <include refid="Base_Column_List" />
+ , ROW_NUMBER() OVER (PARTITION BY device_no,product_no ORDER BY create_time DESC) AS rn
+ FROM sta_wip_sn_ex WHERE device_no = #{deviceNo,jdbcType=VARCHAR}
+ ) t
+ WHERE rn = 1;
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -50,19 +55,19 @@
insert into sta_wip_sn_ex
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="deviceNo != null">device_no,</if>
+ <if test="deviceNo != null and deviceNo !=''">device_no,</if>
<if test="productId != null">product_id,</if>
- <if test="productName != null">product_name,</if>
- <if test="productNo != null">product_no,</if>
+ <if test="productName != null and productName !=''">product_name,</if>
+ <if test="productNo!= null and productNo !=''">product_no,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
+ <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
<if test="productId != null">#{productId,jdbcType=BIGINT},</if>
- <if test="productName != null">#{productName,jdbcType=VARCHAR},</if>
- <if test="productNo != null">#{productNo,jdbcType=VARCHAR},</if>
+ <if test="productName != null and productName !=''">#{productName,jdbcType=VARCHAR},</if>
+ <if test="productNo!= null and productNo !=''">#{productNo,jdbcType=VARCHAR},</if>
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
</trim>
@@ -70,16 +75,16 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
update sta_wip_sn_ex
<set>
- <if test="deviceNo != null">
+ <if test="deviceNo != null and deviceNo !=''">
device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="productId != null">
product_id = #{productId,jdbcType=BIGINT},
</if>
- <if test="productName != null">
+ <if test="productName != null and productName !=''">
product_name = #{productName,jdbcType=VARCHAR},
</if>
- <if test="productNo != null">
+ <if test="productNo!= null and productNo !=''">
product_no = #{productNo,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
--
Gitblit v1.8.0