lims-ruoyi-after.git

			@@ -326,6 +326,7 @@
			ORDER BY COUNT(*) DESC
			LIMIT 1;
			</select>

			<select id="selectSampleCableTag" resultType="java.lang.String">
			SELECT ip.cable_tag
			FROM ins_sample isa
			@@ -333,10 +334,11 @@
			LEFT JOIN ins_product ip ON isa.id = ip.ins_sample_id
			WHERE ip.state = 1
			AND isa.id = #{id}
			and ip.cable_tag is not null
			AND ip.cable_tag IS NOT NULL
			GROUP BY ip.cable_tag
			order by ip.cable_tag
			ORDER BY MIN(ip.id)
			</select>

			<select id="selectSampleItemS" resultType="java.lang.Integer">
			select count(*)
			from (select distinct ip.inspection_item
			@@ -400,9 +402,46 @@
			) labelBarCode
			from ins_order io2
			LEFT JOIN ins_sample isa ON io2.id = isa.ins_order_id
			where type_source = 0
			where type_source = -1
			GROUP BY io2.id) a
			where insOrderId in
			<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
			#{val}
			</foreach>
			</select>

			<!-- 外购下单成品标签打印 -->
			<select id="labelOutsideOrderPrinting" resultType="com.ruoyi.basic.dto.InventoryDetailDTO">
			SELECT
			iiq.id,
			iiq.part_desc,
			iiq.lot_batch_no,
			iiq.part_no,
			iiq.inspect_status as ins_state,
			ippr.insulation_color,
			ippr.outer_color,
			ippr.drum_no,
			ippr.start_meter_mark,
			ippr.end_meter_mark,
			io.update_time,
			-- 检验人查询：优先取指派的负责人，如果没有则取订单创建人
			COALESCE(isu.userName, u.name) AS inspector_name
			FROM ifs_inventory_quantity iiq
			LEFT JOIN ifs_part_props_record ippr ON ippr.ifs_inventory_id = iiq.id
			LEFT JOIN ins_order io ON io.ifs_inventory_id = iiq.id AND io.state != -1
			-- 关联用户表，用于获取订单创建人姓名
			LEFT JOIN user u ON io.create_user = u.id
			-- 关联子查询，用于获取 ins_sample_user 表中指派的检验负责人
			LEFT JOIN (
			SELECT
			ins_sample_id,
			GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS userName
			FROM ins_sample_user isu_inner
			LEFT JOIN user uu ON isu_inner.user_id = uu.id
			WHERE isu_inner.state = 0
			GROUP BY ins_sample_id
			) isu ON isu.ins_sample_id = io.id
			WHERE iiq.id IN
			<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
			#{val}
			</foreach>
			@@ -469,4 +508,107 @@
			and ip.structure_item_parameter_id = #{itmeId}
			group by io.id) a
			</select>
			<select id="selectOrderInfoById" resultType="com.ruoyi.inspect.vo.IfsOrderVO">
			select
			io.id,
			io.entrust_code,
			io.custom,
			io.company,
			io.code,
			io.type,
			io.appointed,
			io.state,
			io.tell,
			io.remark,
			io.remark_en,
			io.otc_code,
			io.user_id,
			io.mating,
			io.create_user,
			io.create_time,
			io.update_user,
			io.update_time,
			io.send_time,
			io.ins_state,
			io.factory,
			io.laboratory,
			io.sample_type,
			io.sample,
			io.ins_result,
			io.ins_time,
			io.processing,
			io.is_leave,
			io.order_type,
			io.send,
			io.form_type,
			io.phone,
			io.examine_time,
			io.engineering,
			io.engineering_en,
			io.production,
			io.production_en,
			io.company_id,
			io.prepare_user_id,
			io.prepare_user,
			io.prepare_user_en,
			io.prepare_code,
			io.out_entrust_code,
			io.is_revocation,
			io.revocation_ins_product_ids,
			io.type_source,
			io.ifs_inventory_id,
			io.test_quantity,
			io.part_detail,
			io.is_exemption,
			io.temperature,
			io.humidity,
			io.sample_status,
			io.quarter_item_id,
			io.sample_view,
			io.sample_view_en,
			io.is_first_submit,
			io.first_submit_date,
			io.update_batch_no,
			io.part_desc,
			io.supplier_name,
			iiq.is_split_order,
			iiq.order_type AS ifs_order_type,
			iiq.part_no,
			iiq.update_batch_no AS lot_batch_no,
			ipps.id AS lot_part_id,
			case
			when ipps.drum_no is not null and ipps.drum_no!='' then ipps.drum_no
			else isor.drum_no
			end AS drum_no,
			case
			when ipps.insulation_color is not null and ipps.insulation_color!='' then ipps.insulation_color
			else isor.insulation_color
			end AS insulation_color,
			case
			when ipps.outer_color is not null and ipps.outer_color!='' then ipps.outer_color
			else isor.outer_color
			end AS outer_color,
			case
			when ipps.lettering_info is not null and ipps.lettering_info!='' then ipps.lettering_info
			else isor.lettering_info
			end AS lettering_info,
			case
			when io.ifs_inventory_id is not null and io.ifs_inventory_id!='' then iiq.contract
			else io.contract
			end AS contract,
			ipps.start_meter_mark,
			ipps.end_meter_mark
			from ins_order io left join ifs_inventory_quantity iiq on io.ifs_inventory_id=iiq.id
			left join ifs_split_order_record isor
			on iiq.order_no=isor.order_no
			and iiq.line_no=isor.line_no
			and iiq.release_no=isor.release_no
			and iiq.receipt_no=isor.receipt_no
			and iiq.part_no=isor.part_no
			AND iiq.update_batch_no = isor.lot_batch_no
			LEFT JOIN ifs_part_props_record ipps ON iiq.id = ipps.ifs_inventory_id
			where io.state !=-1
			AND io.id = #{id}
			LIMIT 1
			</select>
			</mapper>