lims-ruoyi-after.git

			@@ -70,6 +70,7 @@
			<result property="createTime" column="ip_create_time" jdbcType="TIMESTAMP"/>
			<result property="updateTime" column="ip_update_time" jdbcType="TIMESTAMP"/>
			<result property="templateId" column="template_id" jdbcType="INTEGER"/>
			<result property="templateRowIndex" column="template_row_index" jdbcType="INTEGER"/>
			<result property="methodS" column="method_s"/>
			<result property="tell" column="tell"/>
			<result property="dic" column="dic"/>
			@@ -152,6 +153,7 @@
			ip.create_time ip_create_time,
			ip.update_time ip_update_time,
			template_id,
			template_row_index,
			ipr.ins_value,
			ipr.com_value,
			ipr.equip_value,
			@@ -529,7 +531,7 @@
			left join ins_product ip on isa.id = ip.ins_sample_id
			left join ins_product_result ipr on ip.id = ipr.ins_product_id
			where ins_order_id = #{id}
			and ip.standard_method_list_id is not null
			and (ip.standard_method_list_id is not null or ip.template_row_index is not null)
			and state = 1
			and ip.is_binding != 1
			order by ip.sort asc,
			@@ -550,7 +552,7 @@
			and ip.son_laboratory = #{laboratory}
			and ins_fiber_id is null
			and ins_fibers_id is null
			and standard_method_list_id is not null
			and (standard_method_list_id is not null or template_row_index is not null)
			/* 电缆配置标识 */
			<if test="cableTag == null or cableTag == ''">
			and ip.cable_tag is null
			@@ -577,7 +579,7 @@
			and ip.son_laboratory = #{laboratory}
			and ins_fiber_id is null
			and ins_fibers_id is null
			and standard_method_list_id is not null
			and (standard_method_list_id is not null or template_row_index is not null)
			and ip.raw_material_tag = #{rawMaterialTag}
			order by sort asc
			</select>