|
|
|
|
@ -36,7 +36,7 @@
|
|
|
|
|
<result property="delFlag" column="del_flag"/>
|
|
|
|
|
<result property="checkType" column="check_type"/>
|
|
|
|
|
<result property="sampleQuality" column="sample_quality"/>
|
|
|
|
|
|
|
|
|
|
<result property="sampleCode" column="sample_code"/>
|
|
|
|
|
<result property="orderType" column="order_type"/>
|
|
|
|
|
<result property="orderTypeDesc" column="order_type_desc"/>
|
|
|
|
|
</resultMap>
|
|
|
|
|
@ -56,7 +56,7 @@
|
|
|
|
|
qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
|
|
|
|
|
qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,
|
|
|
|
|
qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality,
|
|
|
|
|
qct.sample_quality, qct.type_code, qct.order_type
|
|
|
|
|
qct.sample_quality, qct.type_code, qct.order_type,qct.sample_code
|
|
|
|
|
from qc_check_task qct
|
|
|
|
|
<where>
|
|
|
|
|
<if test="checkNo != null and checkNo != ''">and qct.check_no = #{checkNo}</if>
|
|
|
|
|
@ -150,6 +150,10 @@
|
|
|
|
|
td.belong_to belongTo,
|
|
|
|
|
td.defect_code defectCode,
|
|
|
|
|
td.defect_quality defectQuality,
|
|
|
|
|
td.sample_code sampleCode,
|
|
|
|
|
td.sample_quality sampleQuality,
|
|
|
|
|
td.sample_aql sampleAql,
|
|
|
|
|
td.check_level checkLevel,
|
|
|
|
|
qctp.upper_diff upperDiff,
|
|
|
|
|
qctp.down_diff downDiff,
|
|
|
|
|
qctp.sample,
|
|
|
|
|
@ -216,6 +220,7 @@
|
|
|
|
|
<if test="sampleQuality != null">sample_quality,</if>
|
|
|
|
|
<if test="orderType != null">order_type,</if>
|
|
|
|
|
<if test="orderTypeDesc != null">order_type_desc,</if>
|
|
|
|
|
<if test="sampleCode != null">sample_code,</if>
|
|
|
|
|
</trim>
|
|
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
|
|
<if test="recordId != null">#{recordId},</if>
|
|
|
|
|
@ -252,6 +257,7 @@
|
|
|
|
|
<if test="sampleQuality != null">#{sampleQuality},</if>
|
|
|
|
|
<if test="orderType != null">#{orderType},</if>
|
|
|
|
|
<if test="orderTypeDesc != null">#{orderTypeDesc},</if>
|
|
|
|
|
<if test="sampleCode != null">#{sampleCode},</if>
|
|
|
|
|
</trim>
|
|
|
|
|
</insert>
|
|
|
|
|
|
|
|
|
|
@ -289,6 +295,7 @@
|
|
|
|
|
<if test="delFlag != null">del_flag = #{delFlag},</if>
|
|
|
|
|
<if test="checkType != null">check_type = #{checkType},</if>
|
|
|
|
|
<if test="sampleQuality != null">sample_quality = #{sampleQuality},</if>
|
|
|
|
|
<if test="sampleCode != null">sample_code = #{sampleCode},</if>
|
|
|
|
|
</trim>
|
|
|
|
|
where record_id = #{recordId}
|
|
|
|
|
</update>
|
|
|
|
|
@ -306,6 +313,7 @@
|
|
|
|
|
<if test="cNoOkquality != null">cNoOkquality = #{cNoOkquality},</if>
|
|
|
|
|
<if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
|
|
|
|
|
<if test="remark != null">remark = #{remark},</if>
|
|
|
|
|
<if test="reason != null">reason = #{reason},</if>
|
|
|
|
|
check_result = #{checkResult},
|
|
|
|
|
update_by = #{updateBy},
|
|
|
|
|
update_time = #{updateTime}
|
|
|
|
|
@ -320,6 +328,10 @@
|
|
|
|
|
update_by = #{item.updateBy},
|
|
|
|
|
update_time = #{item.updateTime},
|
|
|
|
|
remark = #{item.remark},
|
|
|
|
|
<if test="item.sampleCode != null">sample_code = #{item.sampleCode},</if>
|
|
|
|
|
<if test="item.sampleQuality != null">sample_quality = #{item.sampleQuality},</if>
|
|
|
|
|
<if test="item.sampleAql != null">sample_aql = #{item.sampleAql},</if>
|
|
|
|
|
<if test="item.checkLevel != null">check_level = #{item.checkLevel},</if>
|
|
|
|
|
defect_code = #{item.defectCode},
|
|
|
|
|
defect_quality = #{item.defectQuality}
|
|
|
|
|
where
|
|
|
|
|
@ -522,6 +534,45 @@
|
|
|
|
|
and quality = #{quality}
|
|
|
|
|
and income_time = #{incomeTime} and del_flag = '0'
|
|
|
|
|
</select>
|
|
|
|
|
<select id="getSampleQua" resultType="String">
|
|
|
|
|
select sample_code
|
|
|
|
|
from qc_sample_rule_code
|
|
|
|
|
where check_level = #{checkLevel}
|
|
|
|
|
and #{quality}>=start_value
|
|
|
|
|
and end_value>= #{quality}
|
|
|
|
|
and del_flag='0'
|
|
|
|
|
</select>
|
|
|
|
|
<select id="getnoOkVals" resultType="java.lang.Integer">
|
|
|
|
|
select
|
|
|
|
|
<if test='sampleAql == "aql1"'>aql1</if>
|
|
|
|
|
<if test='sampleAql == "aql2"'>aql2</if>
|
|
|
|
|
<if test='sampleAql == "aql3"'>aql3</if>
|
|
|
|
|
<if test='sampleAql == "aql4"'>aql4</if>
|
|
|
|
|
<if test='sampleAql == "aql5"'>aql5</if>
|
|
|
|
|
<if test='sampleAql == "aql6"'>aql6</if>
|
|
|
|
|
<if test='sampleAql == "aql7"'>aql7</if>
|
|
|
|
|
<if test='sampleAql == "aql8"'>aql8</if>
|
|
|
|
|
<if test='sampleAql == "aql9"'>aql9</if>
|
|
|
|
|
<if test='sampleAql == "aql10"'>aql10</if>
|
|
|
|
|
<if test='sampleAql == "aql11"'>aql11</if>
|
|
|
|
|
<if test='sampleAql == "aql12"'>aql12</if>
|
|
|
|
|
<if test='sampleAql == "aql13"'>aql13</if>
|
|
|
|
|
<if test='sampleAql == "aql14"'>aql14</if>
|
|
|
|
|
<if test='sampleAql == "aql15"'>aql15</if>
|
|
|
|
|
<if test='sampleAql == "aql16"'>aql16</if>
|
|
|
|
|
<if test='sampleAql == "aql17"'>aql17</if>
|
|
|
|
|
<if test='sampleAql == "aql18"'>aql18</if>
|
|
|
|
|
<if test='sampleAql == "aql19"'>aql19</if>
|
|
|
|
|
<if test='sampleAql == "aql20"'>aql20</if>
|
|
|
|
|
<if test='sampleAql == "aql21"'>aql21</if>
|
|
|
|
|
<if test='sampleAql == "aql22"'>aql22</if>
|
|
|
|
|
<if test='sampleAql == "aql23"'>aql23</if>
|
|
|
|
|
<if test='sampleAql == "aql24"'>aql24</if>
|
|
|
|
|
<if test='sampleAql == "aql25"'>aql25</if>
|
|
|
|
|
<if test='sampleAql == "aql26"'>aql26</if>
|
|
|
|
|
from qc_sample_rule_aql
|
|
|
|
|
where del_flag='0' and sample_code like concat(#{sampleCode},'%')
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<!--批量更新原始表-->
|
|
|
|
|
<update id="updateIncomeBatchList">
|
|
|
|
|
|
zhaoxiaolin
7 months ago