From d6760886b7d9c671629b1f0321365fa4efc7df4a Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 24 九月 2024 10:43:45 +0800
Subject: [PATCH] add pro_type
---
pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml | 2 ++
pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml | 14 ++++++++++++++
pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml | 14 ++++++++++++++
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/QueryVo.java | 5 +++--
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductQualityInspectionItems.java | 3 +++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java | 3 +++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductUnqualifiedReason.java | 3 +++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java | 3 +++
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/QueryVo.java | 2 +-
9 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductQualityInspectionItems.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductQualityInspectionItems.java
index b378cd7..b3d5a71 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductQualityInspectionItems.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductQualityInspectionItems.java
@@ -40,6 +40,9 @@
@TableField(exist = false)
public String proName;
+ @TableField(exist = false)
+ public String proType;
+
/**
* 鍝佹椤圭洰
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java
index d9a2370..24a354f 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java
@@ -45,6 +45,9 @@
@TableField(exist = false)
public String proName;
+ @TableField(exist = false)
+ public String proType;
+
/**
* 鎺掑簭(浠庡ぇ鍒板皬)
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java
index 208f8d7..1a56cdb 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java
@@ -41,6 +41,9 @@
@TableField(exist = false)
public String proName;
+ @TableField(exist = false)
+ public String proType;
+
/**
* 娴嬭瘯椤圭洰
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductUnqualifiedReason.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductUnqualifiedReason.java
index 2d0e612..98005cc 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductUnqualifiedReason.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductUnqualifiedReason.java
@@ -45,6 +45,9 @@
@TableField(exist = false)
public String proName;
+ @TableField(exist = false)
+ public String proType;
+
/**
* 鎺掑簭(浠庡ぇ鍒板皬)
*/
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
index 1293f66..735e927 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -13,6 +13,8 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
index 2bde442..1631f35 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
@@ -13,6 +13,8 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
@@ -84,8 +86,14 @@
from plt_product_scrapping_reason t
where t.deleted!=1
<trim prefix="and" suffixOverrides="and">
+ <if test="proId != null and proId != ''">
+ t.pro_id=#{proId} and
+ </if>
<if test="reason != null and reason != ''">
t.reason like concat('%', #{reason}, '%') and
+ </if>
+ <if test="disabled != null">
+ t.disabled != 1 and
</if>
</trim>
order by sort desc
@@ -101,9 +109,15 @@
from plt_product_scrapping_reason t
where t.deleted!=1
<trim prefix="and" suffixOverrides="and">
+ <if test="proId != null and proId != ''">
+ t.pro_id=#{proId} and
+ </if>
<if test="reason != null and reason != ''">
t.reason like concat('%', #{reason}, '%') and
</if>
+ <if test="disabled != null">
+ t.disabled != 1 and
+ </if>
</trim>
</select>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
index 1c45f70..7727d5e 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
@@ -13,6 +13,8 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
@@ -70,8 +72,14 @@
from plt_product_unqualified_reason t
where t.deleted!=1
<trim prefix="and" suffixOverrides="and">
+ <if test="proId != null and proId != ''">
+ t.pro_id=#{proId} and
+ </if>
<if test="reason != null and reason != ''">
t.reason like concat('%', #{reason}, '%') and
+ </if>
+ <if test="disabled != null">
+ t.disabled != 1 and
</if>
</trim>
order by sort desc
@@ -87,9 +95,15 @@
from plt_product_unqualified_reason t
where t.deleted!=1
<trim prefix="and" suffixOverrides="and">
+ <if test="proId != null and proId != ''">
+ t.pro_id=#{proId} and
+ </if>
<if test="reason != null and reason != ''">
t.reason like concat('%', #{reason}, '%') and
</if>
+ <if test="disabled != null">
+ t.disabled != 1 and
+ </if>
</trim>
</select>
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/QueryVo.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/QueryVo.java
index a75a19c..541fec5 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/QueryVo.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/QueryVo.java
@@ -12,7 +12,8 @@
public class QueryVo extends QueryConditionVo {
public String reason;
/**
- * 浜у搧鍚嶇О
+ * 浜у搧ID
*/
- public String proName;
+ public Long proId;
+
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/QueryVo.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/QueryVo.java
index 8ded3c4..926d026 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/QueryVo.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/QueryVo.java
@@ -14,5 +14,5 @@
/**
* 浜у搧鍚嶇О
*/
- public String proName;
+ public String proId;
}
--
Gitblit v1.8.0