From 9988c29bf4682179f8591afc89cc4bdd02313a8e Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 22 三月 2024 10:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 d9720a9..fa1dd2a 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -29,6 +29,8 @@
<result property="spareField4" column="spare_field_4" />
<result property="collectData" column="collect_data" />
<result property="results" column="results" />
+ <result property="counts" column="counts" />
+
</resultMap>
<sql id="selectBsFormulaChildInfoVo">
@@ -47,6 +49,10 @@
<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>
+ <if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
+ <if test="spareField4 != null and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
+
+
</where>
ORDER BY step_sort ASC
@@ -153,26 +159,39 @@
</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
TOP 1 *
FROM
bs_formula_child_info
- WHERE NOT results = 'OK'
- AND product_code = #{productCode}
- AND processes_code = #{processesCode}
+ WHERE
+ processes_code = #{processesCode}
+ AND product_code = #{productCode}
AND operation_type = #{operationType}
+ AND (results IS NULL OR results = '')
ORDER BY step_sort ASC
</select>
- <select id="releaseCheck" resultMap="BsFormulaChildInfoResult" parameterType="BsFormulaChildInfo">
- SELECT
- *
- FROM
- bs_formula_child_info
- WHERE
- NOT results = 'OK'
- AND product_code = #{productCode}
- AND processes_code = #{processesCode};
+ <select id="getCount" parameterType="BsFormulaChildInfo" resultMap="BsFormulaChildInfoResult">
+ SELECT COUNT(*) AS counts
+ FROM bs_formula_child_info
+ WHERE (processes_code = #{processesCode} AND product_code = #{productCode})
+ AND (results IS NULL OR results = '');
+ </select>
+
+ <select id="releaseCheck" parameterType="BsFormulaChildInfo" resultMap="BsFormulaChildInfoResult">
+ SELECT COUNT(*) AS counts
+ FROM bs_formula_child_info
+ WHERE (processes_code = #{processesCode} AND product_code = #{productCode})
+ AND (results IS NULL OR results = '');
</select>
<update id="workpieceRelease" parameterType="BsFormulaChildInfo">
--
Gitblit v1.9.3