|
|
|
|
@ -415,6 +415,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
mt.equipmentCode,
|
|
|
|
|
equ.equipment_name
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<select id="getHourProductionHFList" resultType="com.op.mes.domain.MesHourReport">
|
|
|
|
|
select
|
|
|
|
|
concat(mt.device_code,mt.ymdh) equCodeHour,
|
|
|
|
|
mt.ymdh,
|
|
|
|
|
mt.device_code equCode,
|
|
|
|
|
equ.equipment_name equName,
|
|
|
|
|
count(0) quantity,
|
|
|
|
|
'车' unit
|
|
|
|
|
from
|
|
|
|
|
(
|
|
|
|
|
select
|
|
|
|
|
SUBSTRING(CONVERT(varchar(100),create_time, 20), 0, 14) ymdh,
|
|
|
|
|
device_code,
|
|
|
|
|
workorder_code
|
|
|
|
|
from mes_dryinghouse_result
|
|
|
|
|
where type = '1'
|
|
|
|
|
and CONVERT(varchar(30),create_time, 120) >= #{productDateStart}
|
|
|
|
|
and #{productDateEnd} > CONVERT(varchar(30),create_time, 120)
|
|
|
|
|
)mt
|
|
|
|
|
left join base_equipment equ on mt.device_code = equ.equipment_code
|
|
|
|
|
where 1=1
|
|
|
|
|
<if test="equName != null and equName != ''">
|
|
|
|
|
and equ.equipment_name like concat('%', #{equName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
group by
|
|
|
|
|
mt.ymdh,
|
|
|
|
|
mt.device_code,
|
|
|
|
|
equ.equipment_name
|
|
|
|
|
</select>
|
|
|
|
|
<select id="getHourProductionCXJList" resultType="com.op.mes.domain.MesHourReport">
|
|
|
|
|
select
|
|
|
|
|
concat(mt.workorder_name,mt.ymdh) equCodeHour,
|
|
|
|
|
mt.ymdh,
|
|
|
|
|
mt.workorder_name equCode,
|
|
|
|
|
equ.equipment_name equName,
|
|
|
|
|
count(0) quantity,
|
|
|
|
|
'车' unit
|
|
|
|
|
from
|
|
|
|
|
(
|
|
|
|
|
select
|
|
|
|
|
SUBSTRING(CONVERT(varchar(100),create_time, 20), 0, 14) ymdh,
|
|
|
|
|
workorder_name,
|
|
|
|
|
workorder_code
|
|
|
|
|
from mes_cxj_producted
|
|
|
|
|
where CONVERT(varchar(30),create_time, 120) >= #{productDateStart}
|
|
|
|
|
and #{productDateEnd} > CONVERT(varchar(30),create_time, 120)
|
|
|
|
|
)mt
|
|
|
|
|
left join base_equipment equ on mt.workorder_name = equ.equipment_code
|
|
|
|
|
left join pro_order_workorder pow on pow.workorder_id = mt.workorder_code
|
|
|
|
|
where pow.order_code is not null
|
|
|
|
|
<if test="shiftId != null and shiftId != ''">
|
|
|
|
|
and pow.shift_id = #{shiftId}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="orderCode != null and orderCode != ''">
|
|
|
|
|
and pow.order_code like concat('%', #{orderCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productCode != null and productCode != ''">
|
|
|
|
|
and pow.product_code like concat('%', #{productCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productName != null and productName != ''">
|
|
|
|
|
and pow.product_name like concat('%', #{productName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workorderCode != null and workorderCode != ''">
|
|
|
|
|
and pow.workorder_code like concat('%', #{workorderCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="equName != null and equName != ''">
|
|
|
|
|
and equ.equipment_name like concat('%', #{equName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
group by
|
|
|
|
|
mt.ymdh,
|
|
|
|
|
mt.workorder_name,
|
|
|
|
|
equ.equipment_name
|
|
|
|
|
</select>
|
|
|
|
|
<select id="selectProShift" resultType="com.op.mes.domain.MesShift">
|
|
|
|
|
SELECT bst.Shift_Id shiftId,bst.Shift_Desc shiftDesc
|
|
|
|
|
FROM base_shifts_t bst
|
|
|
|
|
@ -1243,7 +1317,97 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
</if>
|
|
|
|
|
GROUP BY t.workorder_name,be.equipment_name,t.product_date
|
|
|
|
|
</select>
|
|
|
|
|
<select id="getEquNamesByEquType" resultType="com.op.mes.domain.MesHourReport">
|
|
|
|
|
select equipment_code equCode,
|
|
|
|
|
equipment_name equName
|
|
|
|
|
from base_equipment
|
|
|
|
|
where equipment_type_code = #{equTypeCode}
|
|
|
|
|
and del_flag ='0'
|
|
|
|
|
order by equipment_name
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<sql id="getCXJTime">
|
|
|
|
|
from mes_cxj_producted mdi
|
|
|
|
|
join pro_order_workorder pow on mdi.workorder_code = pow.workorder_id
|
|
|
|
|
left join base_equipment be on be.equipment_code = mdi.workorder_name
|
|
|
|
|
where pow.product_date >=#{productDateStart} and #{productDateEnd} >= pow.product_date
|
|
|
|
|
<if test="shiftId != null">and pow.shift_id = #{shiftId}</if>
|
|
|
|
|
<if test="orderCode != null and orderCode != ''">
|
|
|
|
|
and pow.order_code like concat('%', #{orderCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productCode != null and productCode != ''">
|
|
|
|
|
and pow.product_code like concat('%', #{productCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productName != null and productName != ''">
|
|
|
|
|
and pow.product_name like concat('%', #{productName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workorderCode != null and workorderCode != ''">
|
|
|
|
|
and pow.workorder_code like concat('%', #{workorderCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="equName != null and equName != ''">
|
|
|
|
|
and equ.equipment_name like concat('%', #{equName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
</sql>
|
|
|
|
|
<select id="getCXJFirstTime" resultType="java.lang.String">
|
|
|
|
|
select min(mdi.create_time)
|
|
|
|
|
<include refid="getCXJTime"/>
|
|
|
|
|
</select>
|
|
|
|
|
<select id="getCXJLastTime" resultType="java.lang.String">
|
|
|
|
|
select max(mdi.create_time)
|
|
|
|
|
<include refid="getCXJTime"/>
|
|
|
|
|
</select>
|
|
|
|
|
<select id="getHFEquNames" resultType="com.op.mes.domain.MesHourReport">
|
|
|
|
|
select
|
|
|
|
|
mdr.device_code equCode,
|
|
|
|
|
equ.equipment_name equName,
|
|
|
|
|
count(0) quantity
|
|
|
|
|
from mes_dryinghouse_result mdr
|
|
|
|
|
left join base_equipment equ on mdr.device_code = equ.equipment_code
|
|
|
|
|
where mdr.type = '1'
|
|
|
|
|
<if test="productDateStart != null "> and CONVERT(varchar(30),mdr.create_time, 120) >= #{productDateStart}</if>
|
|
|
|
|
<if test="productDateEnd != null "> and #{productDateEnd} > CONVERT(varchar(30),mdr.create_time, 120)</if>
|
|
|
|
|
<if test="equName != null and equName != ''">
|
|
|
|
|
and equ.equipment_name like concat('%', #{equName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
group by
|
|
|
|
|
mdr.device_code,
|
|
|
|
|
equ.equipment_name
|
|
|
|
|
order by equ.equipment_name
|
|
|
|
|
</select>
|
|
|
|
|
<select id="getCXJEquNames" resultType="com.op.mes.domain.MesHourReport">
|
|
|
|
|
select
|
|
|
|
|
mt.workorder_name equCode,
|
|
|
|
|
equ.equipment_name equName,
|
|
|
|
|
count(0) quantity
|
|
|
|
|
from mes_cxj_producted mt
|
|
|
|
|
left join base_equipment equ on mt.workorder_name = equ.equipment_code
|
|
|
|
|
left join pro_order_workorder pow on pow.workorder_id = mt.workorder_code
|
|
|
|
|
where 1=1
|
|
|
|
|
<if test="productDateStart != null "> and CONVERT(varchar(30),mt.create_time, 120) >= #{productDateStart}</if>
|
|
|
|
|
<if test="productDateEnd != null "> and #{productDateEnd} > CONVERT(varchar(30),mt.create_time, 120)</if>
|
|
|
|
|
<if test="shiftId != null and shiftId != ''">
|
|
|
|
|
and pow.shift_id = #{shiftId}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="orderCode != null and orderCode != ''">
|
|
|
|
|
and pow.order_code like concat('%', #{orderCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productCode != null and productCode != ''">
|
|
|
|
|
and pow.product_code like concat('%', #{productCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="productName != null and productName != ''">
|
|
|
|
|
and pow.product_name like concat('%', #{productName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workorderCode != null and workorderCode != ''">
|
|
|
|
|
and pow.workorder_code like concat('%', #{workorderCode}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="equName != null and equName != ''">
|
|
|
|
|
and equ.equipment_name like concat('%', #{equName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
group by
|
|
|
|
|
mt.workorder_name,
|
|
|
|
|
equ.equipment_name
|
|
|
|
|
order by equ.equipment_name
|
|
|
|
|
</select>
|
|
|
|
|
<insert id="insertMesReportWork" parameterType="MesReportWork">
|
|
|
|
|
insert into mes_report_work
|
|
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
|
|
|
zhaoxiaolin
3 months ago