add pro_type

Fancy

2024-09-24 d6760886b7d9c671629b1f0321365fa4efc7df4a

add pro_type

 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;

    /**
     * 品检项目
     */

 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;

    /**
     * 排序(从大到小)
     */

 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;

    /**
     * 测试项目
     */

 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;

    /**
     * 排序(从大到小)
     */

 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">

 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>


 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>


 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;

}

 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/QueryVo.java

@@ -14,5 +14,5 @@
    /**
     * 产品名称
     */
    public String proName;
    public String proId;
}