@ -482,7 +482,7 @@
d.sampling_level_desc,
b.default_sampling_proportion,a.order_id
FROM qc_template_detailed a
LEFT JOIN eam_properties_item b ON a.ItemNo = b.ItemNo and a.site = b.site
INNER JOIN eam_properties_item b ON a.ItemNo = b.ItemNo and a.site = b.site
left join qc_sampling_inspection_programme as c on b.site = c.site and b.sampling_programme_no = c.sampling_programme_no
left join qc_sampling_inspection_level as d on b.site = d.site and b.sampling_level_no = d.sampling_level_no
LEFT JOIN eam_object eo ON a.object_id = eo.ObjectID and a.site = b.site
@ -565,6 +565,167 @@
</where>
</select>
<!-- ===================== qc_part_attr_detailed 物料属性检验标准（site+attribute_no+item_no） ===================== -->
<select id= "partAttrDetailedSearch" resultType= "com.heai.modules.pms.data.QcTemplateData" >
SELECT
d.site,
d.bu_no,
d.attribute_no AS attributeNo,
d.item_no AS itemNo,
d.inspection_type_no AS inspectionTypeNo,
b.ItemDesc,
d.default_value AS defaultValue,
b.ValueType AS valueType,
b.ValueType_DB AS valueTypeDb,
d.max_value AS maxValue,
d.min_value AS minValue,
b.ItemRemark AS itemRemark,
b.ItemType AS itemType,
d.object_id AS objectID,
eo.objectDesc,
d.order_id AS orderId
FROM qc_part_attr_detailed d
INNER JOIN eam_properties_item b ON d.item_no = b.ItemNo AND d.site = b.site
LEFT JOIN eam_object eo ON d.object_id = eo.ObjectID AND d.site = b.site
WHERE d.site = #{site}
AND d.attribute_no = #{attributeNo}
AND d.bu_no = #{buNo}
ORDER BY d.order_id, d.item_no
</select>
<select id= "getPartAttrItemList" resultType= "com.heai.modules.pms.data.QcTemplateData" >
SELECT
a.site,
a.bu_no,
a.itemNo,
a.ItemDesc,
a.DefaultValue,
a.MaxValue,
a.MinValue
FROM eam_properties_item a
LEFT JOIN qc_part_attr_detailed d
ON d.site = a.site
AND d.bu_no = #{buNo}
AND d.attribute_no = #{attributeNo}
AND d.item_no = a.ItemNo
WHERE a.ItemType = #{itemType}
AND a.site = #{site}
AND a.bu_no = #{buNo}
AND d.item_no IS NULL
AND dbo.qc_get_inspection_type_name(a.site, a.inspection_type_no) = #{inspectionTypeName}
</select>
<select id= "getPartAttrItem" resultType= "com.heai.modules.pms.data.QcTemplateData" >
SELECT
a.site,
a.bu_no,
a.itemNo,
a.ItemDesc,
a.DefaultValue,
a.MaxValue,
a.MinValue
FROM eam_properties_item a
LEFT JOIN qc_part_attr_detailed d
ON d.site = a.site
AND d.bu_no = #{buNo}
AND d.attribute_no = #{attributeNo}
AND d.item_no = a.ItemNo
<where >
a.ItemType = #{itemType}
AND a.site = #{site}
AND d.item_no IS NULL
AND a.bu_no = #{buNo}
AND dbo.qc_get_inspection_type_name(a.site, a.inspection_type_no) = #{inspectionTypeName}
<if test= "itemNo != null and itemNo != ''" >
AND a.ItemNo LIKE '%' + #{itemNo} + '%'
</if>
<if test= "itemDesc != null and itemDesc != ''" >
AND a.ItemDesc LIKE '%' + #{itemDesc} + '%'
</if>
<if test= "inspectionTypeNo != null and inspectionTypeNo != ''" >
AND a.inspection_type_no = #{inspectionTypeNo}
</if>
</where>
</select>
<select id= "selectPartAttrItemDetails" resultType= "com.heai.modules.pms.data.QcTemplateData" >
SELECT site, bu_no, attribute_no AS attributeNo, item_no AS itemNo
FROM qc_part_attr_detailed
WHERE site = #{site}
AND bu_no = #{buNo}
AND attribute_no = #{attributeNo}
AND item_no = #{itemNo}
</select>
<insert id= "insertPartAttrDetailed" parameterType= "com.heai.modules.pms.data.QcTemplateData" >
INSERT INTO qc_part_attr_detailed
(site, bu_no, attribute_no, item_no, inspection_type_no, default_value, max_value, min_value, object_id, order_id, create_time)
VALUES
(#{site}, #{buNo}, #{attributeNo}, #{itemNo}, #{inspectionTypeNo}, #{defaultValue}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL}, #{objectID}, #{orderId}, getDate())
</insert>
<delete id= "deletePartAttrDetailed" >
DELETE FROM qc_part_attr_detailed
WHERE site = #{site}
AND bu_no = #{buNo}
AND attribute_no = #{attributeNo}
AND item_no = #{itemNo}
</delete>
<delete id= "deletePartAttrDetailedAll" parameterType= "com.heai.modules.pms.data.QcTemplateData" >
DELETE FROM qc_part_attr_detailed
WHERE site = #{site}
AND bu_no = #{buNo}
AND attribute_no = #{attributeNo}
</delete>
<select id= "getPartAttrDetailedMaxOrderId" resultType= "java.lang.Integer" >
SELECT ISNULL(MAX(order_id), 0) + 1
FROM qc_part_attr_detailed
WHERE site = #{site}
AND bu_no = #{buNo}
AND attribute_no = #{attributeNo}
</select>
<select id= "getUpPartAttrItemData" resultType= "com.heai.modules.pms.data.QcTemplateData" >
SELECT TOP 1
site,
bu_no,
attribute_no AS attributeNo,
item_no AS itemNo,
order_id AS orderId
FROM qc_part_attr_detailed
WHERE #{orderId} > order_id
AND site = #{site}
AND bu_no = #{buNo}
AND attribute_no = #{attributeNo}
ORDER BY order_id DESC
</select>
<select id= "getDownPartAttrItemData" resultType= "com.heai.modules.pms.data.QcTemplateData" >
SELECT TOP 1
site,
bu_no,
attribute_no AS attributeNo,
item_no AS itemNo,
order_id AS orderId
FROM qc_part_attr_detailed
WHERE order_id > #{orderId}
AND site = #{site}
AND bu_no = #{buNo}
AND attribute_no = #{attributeNo}
ORDER BY order_id
</select>
<update id= "updatePartAttrDetailedOrder" >
UPDATE qc_part_attr_detailed
SET order_id = #{orderId}
WHERE site = #{site}
AND bu_no = #{buNo}
AND attribute_no = #{attributeNo}
AND item_no = #{itemNo}
</update>
<!-- 删除模板 -->
<delete id= "templateDelete" parameterType= "com.heai.modules.pms.data.QcTemplateData" >
@ -1640,10 +1801,11 @@
FROM SOOpsTransferHeader A
INNER JOIN SOOpsTransferDetail B ON A.Site = B.SITE AND A.TransNo = B.TransNo
INNER JOIN part D ON D.SITE = B.Site AND D.PartNo = B.PartNo
INNER JOIN qc_template as qt ON D.SITE = qt.site AND D.PartNo = qt.template_id
INNER JOIN qc_attribute_template e on D.SITE = e.site and e.attribute_no = D.PartNo
INNER JOIN qc_template as qt ON D.SITE = qt.site AND e.template_id = qt.template_id
LEFT JOIN qc_sampling_inspection_level as qsil ON qt.sampling_level_no = qsil.sampling_level_no and qt.site = qsil.site and qt.bu_no = qsil.bu_no
LEFT JOIN qc_sampling_inspection_programme as qsip ON qt.sampling_programme_no = qsip.sampling_programme_no and qt.site = qsip.site and qt.bu_no = qsip.bu_no
WHERE A.SITE = #{site} AND A.bu_no = #{buNo} AND A.TransNo = #{TransNo }
WHERE A.SITE = #{site} AND qt.bu_no = #{buNo} AND B.TransNo = #{refInfo1} AND B.ItemNo = #{refInfo2 }
</select>
@ -2044,27 +2206,27 @@
<insert id= "saveIPQCRecord" parameterType= "com.heai.modules.pms.data.QcFAIRecordData" >
INSERT INTO qc_ipqc_record
(inspection_no, site, bu_no, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id,
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id)
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id,ref_info1,ref_info2 )
VALUES
(#{inspectionNo}, #{site}, #{buNo}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId},
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId},#{refInfo1},#{refInfo2} )
</insert>
<insert id= "saveIQCRecord" parameterType= "com.heai.modules.pms.data.QcFAIRecordData" >
INSERT INTO qc_iqc_record
(inspection_no, site, bu_no, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id,
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id)
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id,ref_info1,ref_info2 )
VALUES
(#{inspectionNo}, #{site}, #{buNo}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId},
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId},#{refInfo1},#{refInfo2} )
</insert>
<insert id= "saveSQCRecord" parameterType= "com.heai.modules.pms.data.QcFAIRecordData" >
INSERT INTO qc_sqc_record
(inspection_no, site, bu_no, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id,
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id)
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id,ref_info1,ref_info2 )
VALUES
(#{inspectionNo}, #{site}, #{buNo}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId},
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId},#{refInfo1},#{refInfo2} )
</insert>
<!-- 查询IPQC主记录信息 -->
@ -3217,7 +3379,7 @@
a.resource_id,
r.resource_desc,
a.part_no,
d.PartDescription as part_d esc,
d.PartDescription as partD esc,
d.cinv_source_code as cinvSourceCode,
d.sku as sku,
d.invdefinetype as invdefinetype,
@ -3342,10 +3504,10 @@
<insert id= "saveFQCRecord" parameterType= "com.heai.modules.pms.data.QcFAIRecordData" >
INSERT INTO qc_fqc_record
(inspection_no, site, bu_no, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id,
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id)
part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id,ref_info1,ref_info2 )
VALUES
(#{inspectionNo}, #{site}, #{buNo}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId},
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
#{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId},#{refInfo1},#{refInfo2} )
</insert>
<!-- FQC明细记录查询 -->
