From a5767e0144e6ecf4d9e058a6a4d0dbb2e28423b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A4=E9=94=A6=E7=A7=91?= <32996823@qq.com>
Date: Thu, 5 Dec 2024 17:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=95=B0=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/md/BaseKnifeMapper.xml   |   1 +
 .../mapper/wm/BaseTechnologyBomMapper.xml     | 128 ------------------
 2 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 ktg-mes/src/main/resources/mapper/wm/BaseTechnologyBomMapper.xml

diff --git a/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml b/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
index 1c8e252..733e49f 100644
--- a/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
@@ -577,6 +577,7 @@
         FROM BASE_KNIFE BK
         WHERE MBB_BD_MRL_ID = #{mbbBdMrlId}
           AND (KNIFE_FINE_STATE = 0 OR KNIFE_FINE_STATE = 1)
+          AND IS_VALID = 0
     </select>
 
     <select id="selectScrapList" resultMap="BaseKnifeResult">
diff --git a/ktg-mes/src/main/resources/mapper/wm/BaseTechnologyBomMapper.xml b/ktg-mes/src/main/resources/mapper/wm/BaseTechnologyBomMapper.xml
deleted file mode 100644
index 161553b..0000000
--- a/ktg-mes/src/main/resources/mapper/wm/BaseTechnologyBomMapper.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ktg.mes.wm.mapper.BaseTechnologyBomMapper">
-    
-    <resultMap type="BaseTechnologyBom" id="BaseTechnologyBomResult">
-        <result property="technologyBomId"    column="technology_bom_id"    />
-        <result property="figureCode"    column="figure_code"    />
-        <result property="processCode"    column="process_code"    />
-        <result property="processName"    column="process_name"    />
-        <result property="knifeCode"    column="knife_code"    />
-        <result property="knifeSort"    column="knife_sort"    />
-        <result property="knifeCount"    column="knife_count"    />
-        <result property="expendLife"    column="expend_life"    />
-        <result property="remark"    column="remark"    />
-        <result property="attr1"    column="attr1"    />
-        <result property="attr2"    column="attr2"    />
-        <result property="attr3"    column="attr3"    />
-        <result property="attr4"    column="attr4"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectBaseTechnologyBomVo">
-        select technology_bom_id, figure_code, process_code, process_name, knife_code, knife_sort, knife_count, expend_life, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from base_technology_bom
-    </sql>
-
-    <select id="selectBaseTechnologyBomList" parameterType="BaseTechnologyBom" resultMap="BaseTechnologyBomResult">
-        <include refid="selectBaseTechnologyBomVo"/>
-        <where>  
-            <if test="figureCode != null  and figureCode != ''"> and figure_code = #{figureCode}</if>
-            <if test="processCode != null  and processCode != ''"> and process_code = #{processCode}</if>
-            <if test="processName != null  and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
-            <if test="knifeCode != null  and knifeCode != ''"> and knife_code = #{knifeCode}</if>
-            <if test="knifeSort != null  and knifeSort != ''"> and knife_sort = #{knifeSort}</if>
-            <if test="knifeCount != null "> and knife_count = #{knifeCount}</if>
-            <if test="expendLife != null "> and expend_life = #{expendLife}</if>
-            <if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
-            <if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
-            <if test="attr3 != null "> and attr3 = #{attr3}</if>
-            <if test="attr4 != null "> and attr4 = #{attr4}</if>
-        </where>
-    </select>
-    
-    <select id="selectBaseTechnologyBomByTechnologyBomId" parameterType="Long" resultMap="BaseTechnologyBomResult">
-        <include refid="selectBaseTechnologyBomVo"/>
-        where technology_bom_id = #{technologyBomId}
-    </select>
-        
-    <insert id="insertBaseTechnologyBom" parameterType="BaseTechnologyBom">
-        insert into base_technology_bom
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="technologyBomId != null">technology_bom_id,</if>
-            <if test="figureCode != null and figureCode != ''">figure_code,</if>
-            <if test="processCode != null and processCode != ''">process_code,</if>
-            <if test="processName != null and processName != ''">process_name,</if>
-            <if test="knifeCode != null and knifeCode != ''">knife_code,</if>
-            <if test="knifeSort != null and knifeSort != ''">knife_sort,</if>
-            <if test="knifeCount != null">knife_count,</if>
-            <if test="expendLife != null">expend_life,</if>
-            <if test="remark != null">remark,</if>
-            <if test="attr1 != null">attr1,</if>
-            <if test="attr2 != null">attr2,</if>
-            <if test="attr3 != null">attr3,</if>
-            <if test="attr4 != null">attr4,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="technologyBomId != null">#{technologyBomId},</if>
-            <if test="figureCode != null and figureCode != ''">#{figureCode},</if>
-            <if test="processCode != null and processCode != ''">#{processCode},</if>
-            <if test="processName != null and processName != ''">#{processName},</if>
-            <if test="knifeCode != null and knifeCode != ''">#{knifeCode},</if>
-            <if test="knifeSort != null and knifeSort != ''">#{knifeSort},</if>
-            <if test="knifeCount != null">#{knifeCount},</if>
-            <if test="expendLife != null">#{expendLife},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="attr1 != null">#{attr1},</if>
-            <if test="attr2 != null">#{attr2},</if>
-            <if test="attr3 != null">#{attr3},</if>
-            <if test="attr4 != null">#{attr4},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBaseTechnologyBom" parameterType="BaseTechnologyBom">
-        update base_technology_bom
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="figureCode != null and figureCode != ''">figure_code = #{figureCode},</if>
-            <if test="processCode != null and processCode != ''">process_code = #{processCode},</if>
-            <if test="processName != null and processName != ''">process_name = #{processName},</if>
-            <if test="knifeCode != null and knifeCode != ''">knife_code = #{knifeCode},</if>
-            <if test="knifeSort != null and knifeSort != ''">knife_sort = #{knifeSort},</if>
-            <if test="knifeCount != null">knife_count = #{knifeCount},</if>
-            <if test="expendLife != null">expend_life = #{expendLife},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="attr1 != null">attr1 = #{attr1},</if>
-            <if test="attr2 != null">attr2 = #{attr2},</if>
-            <if test="attr3 != null">attr3 = #{attr3},</if>
-            <if test="attr4 != null">attr4 = #{attr4},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where technology_bom_id = #{technologyBomId}
-    </update>
-
-    <delete id="deleteBaseTechnologyBomByTechnologyBomId" parameterType="Long">
-        delete from base_technology_bom where technology_bom_id = #{technologyBomId}
-    </delete>
-
-    <delete id="deleteBaseTechnologyBomByTechnologyBomIds" parameterType="String">
-        delete from base_technology_bom where technology_bom_id in 
-        <foreach item="technologyBomId" collection="array" open="(" separator="," close=")">
-            #{technologyBomId}
-        </foreach>
-    </delete>
-</mapper>
\ No newline at end of file