|
|
|
|
@ -169,38 +169,105 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
order by mpp.dispatch_code,mpp.process_order
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<select id="queryMoritorPageList" parameterType="ProdPlanInfoBo" resultType="ProdPlanInfoVo">
|
|
|
|
|
select
|
|
|
|
|
${ew.getSqlSelect},
|
|
|
|
|
bmi.material_code,
|
|
|
|
|
bmi.material_name,
|
|
|
|
|
bomi.material_name material_bom_name,
|
|
|
|
|
|
|
|
|
|
case
|
|
|
|
|
when t.release_type = 1 then (select pbmi.machine_name
|
|
|
|
|
from prod_base_machine_info pbmi
|
|
|
|
|
where t.release_id = pbmi.machine_id)
|
|
|
|
|
|
|
|
|
|
when t.release_type = 2 then (select su.nick_name
|
|
|
|
|
from sys_user su
|
|
|
|
|
where t.release_id = su.user_id)
|
|
|
|
|
|
|
|
|
|
when t.release_type = 3 then (select pbsi.station_name
|
|
|
|
|
from prod_base_station_info pbsi
|
|
|
|
|
where t.release_id = pbsi.station_id)
|
|
|
|
|
end as release_name,
|
|
|
|
|
<!-- 查询生产计划监控列表(按机台和班次分组) -->
|
|
|
|
|
<resultMap id="planMonitorResultMap" type="org.dromara.mes.domain.vo.PlanMonitorVo">
|
|
|
|
|
<id property="machineId" column="machineId"/>
|
|
|
|
|
<result property="machineName" column="machineName"/>
|
|
|
|
|
<collection property="shifts" ofType="org.dromara.mes.domain.vo.ShiftGroupVo">
|
|
|
|
|
<id property="shiftId" column="shiftId"/>
|
|
|
|
|
<result property="shiftName" column="shiftName"/>
|
|
|
|
|
<collection property="plans" ofType="org.dromara.mes.domain.vo.ProdPlanInfoVo">
|
|
|
|
|
<id property="planId" column="planId"/>
|
|
|
|
|
<result property="productOrderId" column="product_order_id"/>
|
|
|
|
|
<result property="saleOrderId" column="sale_order_id"/>
|
|
|
|
|
<result property="saleorderCode" column="saleorder_code"/>
|
|
|
|
|
<result property="planCode" column="plan_code"/>
|
|
|
|
|
<result property="dispatchCode" column="dispatch_code"/>
|
|
|
|
|
<result property="materialId" column="material_id"/>
|
|
|
|
|
<result property="materialName" column="material_name"/>
|
|
|
|
|
<result property="processId" column="process_id"/>
|
|
|
|
|
<result property="processOrder" column="process_order"/>
|
|
|
|
|
<result property="lastProcessId" column="last_process_id"/>
|
|
|
|
|
<result property="finalProcessFlag" column="final_process_flag"/>
|
|
|
|
|
<result property="releaseType" column="release_type"/>
|
|
|
|
|
<result property="releaseId" column="release_id"/>
|
|
|
|
|
<result property="productionTime" column="production_time"/>
|
|
|
|
|
<result property="planAmount" column="plan_amount"/>
|
|
|
|
|
<result property="dispatchAmount" column="dispatch_amount"/>
|
|
|
|
|
<result property="completeAmount" column="complete_amount"/>
|
|
|
|
|
<result property="planBeginTime" column="plan_begin_time"/>
|
|
|
|
|
<result property="planEndTime" column="plan_end_time"/>
|
|
|
|
|
<result property="realBeginTime" column="real_begin_time"/>
|
|
|
|
|
<result property="realEndTime" column="real_end_time"/>
|
|
|
|
|
<result property="attachId" column="attach_id"/>
|
|
|
|
|
<result property="planStatus" column="plan_status"/>
|
|
|
|
|
<result property="importFlag" column="import_flag"/>
|
|
|
|
|
<result property="finishFlag" column="finish_flag"/>
|
|
|
|
|
<result property="priority" column="priority"/>
|
|
|
|
|
<result property="shiftId" column="shift_id"/>
|
|
|
|
|
<result property="classTeamId" column="class_team_id"/>
|
|
|
|
|
<result property="modelCode" column="model_code"/>
|
|
|
|
|
<result property="remark" column="remark"/>
|
|
|
|
|
</collection>
|
|
|
|
|
</collection>
|
|
|
|
|
</resultMap>
|
|
|
|
|
|
|
|
|
|
pbpi.process_name,
|
|
|
|
|
bsi.shift_name,
|
|
|
|
|
bcti.team_name
|
|
|
|
|
from ${tableName} t
|
|
|
|
|
left join base_material_info bmi on bmi.material_id = t.material_id
|
|
|
|
|
left join prod_material_bom pmb on pmb.material_bom_id = t.material_bom_id
|
|
|
|
|
left join base_material_info bomi on bomi.material_id = pmb.material_id
|
|
|
|
|
left join prod_base_process_info pbpi on pbpi.process_id = t.process_id
|
|
|
|
|
left join base_shift_info bsi on bsi.shift_id = t.shift_id
|
|
|
|
|
left join base_class_team_info bcti on bcti.class_team_id = t.class_team_id
|
|
|
|
|
${ew.getCustomSqlSegment}
|
|
|
|
|
<select id="queryMoritorList" resultMap="planMonitorResultMap">
|
|
|
|
|
WITH ReleaseInfo AS (
|
|
|
|
|
SELECT
|
|
|
|
|
t.release_id as machineId,
|
|
|
|
|
t.tenant_id,
|
|
|
|
|
CASE
|
|
|
|
|
WHEN t.release_type = 1 THEN (SELECT pbmi.machine_name FROM prod_base_machine_info pbmi WHERE t.release_id = pbmi.machine_id)
|
|
|
|
|
/* WHEN t.release_type = 2 THEN (SELECT su.nick_name FROM sys_user su WHERE t.release_id = su.user_id)
|
|
|
|
|
WHEN t.release_type = 3 THEN (SELECT pbsi.station_name FROM prod_base_station_info pbsi WHERE t.release_id = pbsi.station_id)*/
|
|
|
|
|
END as machineName
|
|
|
|
|
FROM ${tableName} t
|
|
|
|
|
WHERE t.release_id IS NOT NULL
|
|
|
|
|
GROUP BY t.release_id, t.release_type, t.tenant_id
|
|
|
|
|
)
|
|
|
|
|
SELECT
|
|
|
|
|
r.machineId,
|
|
|
|
|
r.machineName,
|
|
|
|
|
COALESCE(t.shift_id, 0) as shiftId,
|
|
|
|
|
COALESCE(bsi.shift_name, '未分班') as shiftName,
|
|
|
|
|
t.plan_id as planId,
|
|
|
|
|
t.product_order_id,
|
|
|
|
|
t.sale_order_id,
|
|
|
|
|
t.saleorder_code,
|
|
|
|
|
t.plan_code,
|
|
|
|
|
t.dispatch_code,
|
|
|
|
|
t.material_id,
|
|
|
|
|
bmi.material_name,
|
|
|
|
|
t.process_id,
|
|
|
|
|
t.process_order,
|
|
|
|
|
t.last_process_id,
|
|
|
|
|
t.final_process_flag,
|
|
|
|
|
t.release_type,
|
|
|
|
|
t.release_id,
|
|
|
|
|
t.production_time,
|
|
|
|
|
t.plan_amount,
|
|
|
|
|
t.dispatch_amount,
|
|
|
|
|
t.complete_amount,
|
|
|
|
|
t.plan_begin_time,
|
|
|
|
|
t.plan_end_time,
|
|
|
|
|
t.real_begin_time,
|
|
|
|
|
t.real_end_time,
|
|
|
|
|
t.attach_id,
|
|
|
|
|
t.plan_status,
|
|
|
|
|
t.import_flag,
|
|
|
|
|
t.finish_flag,
|
|
|
|
|
t.priority,
|
|
|
|
|
t.shift_id,
|
|
|
|
|
t.class_team_id,
|
|
|
|
|
t.model_code,
|
|
|
|
|
t.remark
|
|
|
|
|
FROM ReleaseInfo r
|
|
|
|
|
LEFT JOIN ${tableName} t ON r.machineId = t.release_id
|
|
|
|
|
LEFT JOIN base_shift_info bsi ON t.shift_id = bsi.shift_id
|
|
|
|
|
LEFT JOIN base_material_info bmi ON t.material_id = bmi.material_id
|
|
|
|
|
${ew.customSqlSegment}
|
|
|
|
|
ORDER BY r.machineId, t.shift_id, t.plan_id
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
</mapper>
|
|
|
|
|
|
