|
|
@@ -288,7 +288,8 @@
|
|
|
imm.equipment_name AS equipmentName,
|
|
|
imm.trade_mark AS tradeMark,
|
|
|
ibbpt.armor_pic AS armorPic,
|
|
|
- ittn.interface_type AS interfaceType
|
|
|
+ ittn.interface_type AS interfaceType,
|
|
|
+ ittn.exe_status AS exeStatus
|
|
|
FROM
|
|
|
imcs_p_plan ipp,
|
|
|
imcs_t_task itt,
|
|
|
@@ -312,7 +313,7 @@
|
|
|
AND imfc.id = ibbpt.tray_id
|
|
|
AND imm.id = ibb.meterial_id
|
|
|
AND itt.resource_id = #{resourceId}
|
|
|
- ORDER BY itt.status DESC, itt.expect_start_time LIMIT 0, 2
|
|
|
+ ORDER BY ittn.exe_status DESC, itt.expect_start_time LIMIT 0, 2
|
|
|
</select>
|
|
|
<select id="selectTotalMachineUseTime" resultType="java.lang.Integer">
|
|
|
SELECT
|
yejian