From a36b834b2957440a755652ff17d067b18f4e9250 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 29 一月 2024 16:55:05 +0800
Subject: [PATCH] 工位终端
---
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index 96d6d33..c0265ce 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -27,10 +27,12 @@
<result property="spareField2" column="spare_field_2" />
<result property="spareField3" column="spare_field_3" />
<result property="spareField4" column="spare_field_4" />
+ <result property="collectData" column="collect_data" />
+ <result property="results" column="results" />
</resultMap>
<sql id="selectBsFormulaChildInfoVo">
- select id, workshop_code, line_code, processes_code, product_code, operation_steps, tech_requirement, operation_type, step_sort, param_code, material_code, formula_code, picture, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from bs_formula_child_info
+ select id, workshop_code, line_code, processes_code, product_code, operation_steps, tech_requirement, operation_type, step_sort, param_code, material_code, formula_code, picture, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, collect_data, results from bs_formula_child_info
</sql>
<select id="selectBsFormulaChildInfoList" parameterType="BsFormulaChildInfo" resultMap="BsFormulaChildInfoResult">
@@ -42,8 +44,12 @@
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
<if test="operationType != null and operationType != ''"> and operation_type like concat('%', #{operationType}, '%')</if>
<if test="formulaCode != null and formulaCode != ''"> and formula_code like concat('%', #{formulaCode}, '%')</if>
+ <if test="collectData != null and collectData != ''"> and collect_data = #{collectData}</if>
+ <if test="results != null and result != ''"> and result = #{results}</if>
+ <if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
</where>
+ ORDER BY step_sort ASC
</select>
<select id="selectBsFormulaChildInfoById" parameterType="Long" resultMap="BsFormulaChildInfoResult">
@@ -75,6 +81,8 @@
<if test="spareField2 != null">spare_field_2,</if>
<if test="spareField3 != null">spare_field_3,</if>
<if test="spareField4 != null">spare_field_4,</if>
+ <if test="collectData != null">collect_data,</if>
+ <if test="results != null">results,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workshopCode != null">#{workshopCode},</if>
@@ -98,6 +106,8 @@
<if test="spareField2 != null">#{spareField2},</if>
<if test="spareField3 != null">#{spareField3},</if>
<if test="spareField4 != null">#{spareField4},</if>
+ <if test="collectData != null">collect_data,</if>
+ <if test="results != null">results,</if>
</trim>
</insert>
@@ -125,6 +135,8 @@
<if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
<if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
<if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
+ <if test="collectData != null">collect_data = #{collectData},</if>
+ <if test="results != null">results = #{results},</if>
</trim>
where id = #{id}
</update>
@@ -139,4 +151,24 @@
#{id}
</foreach>
</delete>
+
+ <select id="selectBsFormulaChildInfoByTypeTopOne" parameterType="BsFormulaChildInfo" resultMap="BsFormulaChildInfoResult">
+ SELECT
+ TOP 1 *
+ FROM
+ bs_formula_child_info
+ WHERE NOT results = 'OK'
+ AND product_code = #{productCode}
+ AND processes_code = #{processesCode}
+ AND operation_type = #{operationType}
+ ORDER BY step_sort ASC
+ </select>
+
+ <select id="releaseCheck" resultMap="BsFormulaChildInfoResult">
+ SELECT
+ *
+ FROM
+ bs_formula_child_info
+ WHERE NOT results = 'OK'
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3