Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024-07-04 设备-点检、巡检、保养、维修-检查人姓名+检查人工号

Browse Source
master
A0010407 7 months ago
parent b13b68d10a
commit fe306c43a7
4 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File

15
op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
Unescape Escape View File

@ -126,6 +126,12 @@ public class EquOrder extends BaseEntity {
@Excel(name = "责任人")
private String planPerson;
/**
* 责任人姓名
*/
@Excel(name = "责任人姓名")
private String planPersonName;
/**
* 工单用时
*/
@ -678,6 +684,14 @@ public class EquOrder extends BaseEntity {
return planPerson;
}
public void setPlanPersonName(String planPersonName) {
this.planPersonName = planPersonName;
}
public String getPlanPersonName() {
return planPersonName;
}
public void setOrderCostTime(String orderCostTime) {
this.orderCostTime = orderCostTime;
}
@ -796,6 +810,7 @@ public class EquOrder extends BaseEntity {
.append("orderStatus", getOrderStatus())
.append("orderCost", getOrderCost())
.append("planPerson", getPlanPerson())
.append("planPersonName", getPlanPersonName())
.append("orderCostTime", getOrderCostTime())
.append("orderSignPerson", getOrderSignPerson())
.append("factoryCode", getFactoryCode())

12
op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
Unescape Escape View File

@ -46,9 +46,12 @@ public class EquRepairWorkOrder extends BaseEntity {
@Excel(name = "关联计划")
private String orderRelevance;
@Excel(name = "维修人员")
@Excel(name = "维修人员工号")
private String workPerson;
@Excel(name = "维修人员姓名")
private String workPersonName;
@Excel(name = "维修组")
private String workTeam;
@ -392,6 +395,13 @@ public class EquRepairWorkOrder extends BaseEntity {
return workPerson;
}
public void setWorkPersonName(String workPersonName) {
this.workPersonName = workPersonName;
}
public String getWorkPersonName() {
return workPersonName;
}
public void setWorkTeam(String workTeam) {
this.workTeam = workTeam;
}

22
op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
Unescape Escape View File

@ -22,6 +22,7 @@
<result property="orderStatus" column="order_status"/>
<result property="orderCost" column="order_cost"/>
<result property="planPerson" column="plan_person"/>
<result property="planPersonName" column="plan_person_name"/>
<result property="orderCostTime" column="order_cost_time"/>
<result property="orderSignPerson" column="order_sign_person"/>
<result property="factoryCode" column="factory_code"/>
@ -54,7 +55,7 @@
<sql id="selectEquOrderVo">
select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type,
plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status,
order_cost, plan_person, order_cost_time, order_sign_person,
order_cost, plan_person, plan_person_name, order_cost_time, order_sign_person,
factory_code, attr1, attr2, attr3, del_flag, create_by, create_time,
update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code,work_code,outsource_code
from equ_order
@ -79,6 +80,7 @@
eo.order_status,
eo.order_cost,
eo.plan_person,
eo.plan_person_name,
eo.order_cost_time,
eo.order_sign_person,
eo.factory_code,
@ -120,6 +122,7 @@
<if test="orderStatus != null and orderStatus != ''">and eo.order_status = #{orderStatus}</if>
<if test="orderCost != null ">and eo.order_cost = #{orderCost}</if>
<if test="planPerson != null and planPerson != ''">and eo.plan_person like concat('%', #{planPerson}, '%')</if>
<if test="planPersonName != null and planPersonName != ''">and eo.plan_person_name like concat('%', #{planPersonName}, '%')</if>
<if test="orderCostTime != null and orderCostTime != ''">and eo.order_cost_time = #{orderCostTime}</if>
<if test="orderSignPerson != null and orderSignPerson != ''">and eo.order_sign_person = #{orderSignPerson}</if>
<if test="factoryCode != null and factoryCode != ''">and eo.factory_code = #{factoryCode}</if>
@ -198,6 +201,7 @@
eo.order_status,
eo.order_cost,
eo.plan_person,
eo.plan_person_name,
eo.order_cost_time,
eo.order_sign_person,
eo.factory_code,
@ -219,7 +223,10 @@
be.equipment_name
from equ_order eo
left join base_equipment be on eo.equipment_code = be.equipment_code
where eo.plan_type = #{planType}
<where>
<if test="createTime == null ">CONVERT(date,eo.create_time) = CONVERT(date,GETDATE())</if>
<if test="createTime != null"> CONVERT(date,eo.create_time) = #{createTime}</if>
and eo.plan_type = #{planType}
and eo.del_flag = '0'
and eo.order_status != '1'
and eo.order_code in (select order_code
@ -227,6 +234,7 @@
where del_flag = '0'
and user_name = #{userId}
GROUP BY order_code)
</where>
order by eo.plan_loop_type, eo.plan_loop, eo.create_time desc, eo.equipment_code
</select>
@ -248,6 +256,7 @@
eo.order_status,
eo.order_cost,
eo.plan_person,
eo.plan_person_name,
eo.order_cost_time,
eo.order_sign_person,
eo.factory_code,
@ -269,7 +278,10 @@
be.equipment_name
from equ_order eo
left join base_equipment be on eo.equipment_code = be.equipment_code
where eo.del_flag = '0'
<where>
<if test="createTime == null ">CONVERT(date,eo.create_time) = CONVERT(date,GETDATE())</if>
<if test="createTime != null">and CONVERT(date,eo.create_time) = #{createTime}</if>
and eo.del_flag = '0'
and eo.order_status = '1'
and eo.plan_type = #{planType}
and eo.plan_person = #{userId}
@ -277,6 +289,7 @@
from equ_order_person
where del_flag = '0' and user_name = #{userId}
GROUP BY order_code)
</where>
order by eo.update_time desc
</select>
@ -304,6 +317,7 @@
<if test="orderStatus != null">order_status,</if>
<if test="orderCost != null">order_cost,</if>
<if test="planPerson != null">plan_person,</if>
<if test="planPersonName != null">plan_person_name,</if>
<if test="orderCostTime != null">order_cost_time,</if>
<if test="orderSignPerson != null">order_sign_person,</if>
<if test="factoryCode != null">factory_code,</if>
@ -343,6 +357,7 @@
<if test="orderStatus != null">#{orderStatus},</if>
<if test="orderCost != null">#{orderCost},</if>
<if test="planPerson != null">#{planPerson},</if>
<if test="planPersonName != null">#{planPersonName},</if>
<if test="orderCostTime != null">#{orderCostTime},</if>
<if test="orderSignPerson != null">#{orderSignPerson},</if>
<if test="factoryCode != null">#{factoryCode},</if>
@ -384,6 +399,7 @@
<if test="orderStatus != null">order_status = #{orderStatus},</if>
<if test="orderCost != null">order_cost = #{orderCost},</if>
<if test="planPerson != null">plan_person = #{planPerson},</if>
<if test="planPersonName != null">plan_person_name = #{planPersonName},</if>
<if test="orderCostTime != null">order_cost_time = #{orderCostTime},</if>
<if test="orderSignPerson != null">order_sign_person = #{orderSignPerson},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>

14
op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml
Unescape Escape View File

@ -16,6 +16,7 @@
<result property="workPlanDownTime" column="work_plan_down_time"/>
<result property="orderRelevance" column="order_relevance"/>
<result property="workPerson" column="work_person"/>
<result property="workPersonName" column="work_person_name"/>
<result property="workTeam" column="work_team"/>
<result property="workOutsource" column="work_outsource"/>
<result property="workDownMachine" column="work_down_machine"/>
@ -91,7 +92,7 @@
</sql>
<sql id="selectEquRepairWorkOrderVo">
select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect from equ_repair_work_order
select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect,work_person_name from equ_repair_work_order
</sql>
<select id="selectEquRepairWorkOrderList" parameterType="EquRepairWorkOrder" resultMap="EquRepairWorkOrderResult">
@ -105,6 +106,7 @@
erwo.work_plan_down_time,
erwo.order_relevance,
erwo.work_person,
erwo.work_person_name,
erwo.work_team,
erwo.work_outsource,
erwo.work_down_machine,
@ -165,9 +167,8 @@
CONVERT(date,erwo.work_plan_down_time)
</if>
<!--维修人员 维修组-->
<if test="workPerson != null and workPerson != ''">and erwo.work_person like concat('%', #{workPerson},
'%')
</if>
<if test="workPerson != null and workPerson != ''">and erwo.work_person like concat('%', #{workPerson},'%')</if>
<if test="workPersonName != null and workPersonName != ''">and erwo.work_person_name like concat('%', #{workPersonName},'%')</if>
<if test="workTeam != null and workTeam != ''">and erwo.work_team like concat('%', #{workTeam}, '%')</if>
<!--是否委外 委外工单编码-->
<if test="workOutsource != null and workOutsource != ''">and erwo.work_outsource = #{workOutsource}</if>
@ -203,6 +204,7 @@
erwo.work_plan_down_time,
erwo.order_relevance,
erwo.work_person,
erwo.work_person_name,
erwo.work_team,
erwo.work_outsource,
erwo.work_down_machine,
@ -257,6 +259,7 @@
erwo.work_plan_down_time,
erwo.order_relevance,
erwo.work_person,
erwo.work_person_name,
erwo.work_team,
erwo.work_outsource,
erwo.work_down_machine,
@ -325,6 +328,7 @@
<if test="workPlanDownTime != null">work_plan_down_time,</if>
<if test="orderRelevance != null">order_relevance,</if>
<if test="workPerson != null">work_person,</if>
<if test="workPersonName != null">work_person_name,</if>
<if test="workTeam != null">work_team,</if>
<if test="workOutsource != null">work_outsource,</if>
<if test="workDownMachine != null">work_down_machine,</if>
@ -367,6 +371,7 @@
<if test="workPlanDownTime != null">#{workPlanDownTime},</if>
<if test="orderRelevance != null">#{orderRelevance},</if>
<if test="workPerson != null">#{workPerson},</if>
<if test="workPersonName != null">#{workPersonName},</if>
<if test="workTeam != null">#{workTeam},</if>
<if test="workOutsource != null">#{workOutsource},</if>
<if test="workDownMachine != null">#{workDownMachine},</if>
@ -412,6 +417,7 @@
work_plan_down_time = #{workPlanDownTime},
<if test="orderRelevance != null">order_relevance = #{orderRelevance},</if>
<if test="workPerson != null">work_person = #{workPerson},</if>
<if test="workPersonName != null">work_person_name = #{workPersonName},</if>
<if test="workTeam != null">work_team = #{workTeam},</if>
<if test="workOutsource != null">work_outsource = #{workOutsource},</if>
<if test="workDownMachine != null">work_down_machine = #{workDownMachine},</if>

Write Preview
Loading…
Cancel
Save