|
|
@@ -218,30 +218,31 @@
|
|
|
icc.cutting_tool_name,
|
|
|
(case when tmp1.needCuttingTools = icc.cutting_tool_name then '通过' else '不足' end) as checkResult,
|
|
|
(select icta.id from imcs_cutting_tool_apply icta where icta.resource_id = tmp1.resourceId and icta.cutting_tool_name = tmp1.needCuttingTools and icta.plan_id = tmp1.planId and icta.produce_id = tmp1.produceId) as applyId
|
|
|
- FROM (SELECT
|
|
|
+ FROM (SELECT distinct
|
|
|
ippp.plan_id AS planId,
|
|
|
ibb.name,
|
|
|
IFNULL(ibb.no, '') AS partNo,
|
|
|
ibbp.id AS produceId,
|
|
|
ibbp.no AS produceNo,
|
|
|
- ibbpt.resource_id AS resourceId,
|
|
|
+ ibbpp.resource_id AS resourceId,
|
|
|
(SELECT
|
|
|
itp.name
|
|
|
FROM imcs_tenant_productionresource itp
|
|
|
- WHERE itp.id = ibbpt.resource_id) AS resourceName,
|
|
|
- ibbpt.tool_name AS needCuttingTools
|
|
|
- FROM imcs_p_plan_product ippp,
|
|
|
+ WHERE itp.id = ibbpp.resource_id) AS resourceName,
|
|
|
+ (SELECT ict.cutting_tool_name FROM imcs_cutting_tool ict WHERE ict.id = ibbpt.tool_id) AS needCuttingTools
|
|
|
+ FROM imcs_p_plan_product ippp,
|
|
|
imcs_b_bom ibb,
|
|
|
imcs_b_bom_version_info ibbvi,
|
|
|
imcs_b_bom_procedure ibbp,
|
|
|
- imcs_b_bom_procedure_tool ibbpt
|
|
|
-
|
|
|
+ imcs_b_bom_procedure_tool ibbpt,
|
|
|
+ imcs_b_bom_procedure_productionresource ibbpp
|
|
|
WHERE ippp.bom_id = ibb.id
|
|
|
AND ibb.id = ibbvi.bom_id
|
|
|
AND ibbvi.use_status = '1'
|
|
|
AND ibbp.bom_id = ibbvi.bom_id
|
|
|
AND ibbp.id = ibbpt.procedure_id
|
|
|
AND ibbp.program_conf = '2'
|
|
|
+ AND ibbp.id = ibbpp.procedure_id
|
|
|
<if test="planId != null and planId != ''">
|
|
|
and ippp.plan_id = #{planId}
|
|
|
</if>
|
yejian