工单显示字段增加计划名称

orign^2
wws 1 year ago
parent 2f48dfba53
commit 9b8cb7dc45

@ -149,6 +149,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
List<WorkCenter> workCenters = equPlanMapper.selectWorkCenter(factory); List<WorkCenter> workCenters = equPlanMapper.selectWorkCenter(factory);
// 设置工作中心
for (EquOrder order : orderList) { for (EquOrder order : orderList) {
for (WorkCenter center : workCenters) { for (WorkCenter center : workCenters) {
if (center.getFactoryCode().equals(order.getPlanWorkshop())) { if (center.getFactoryCode().equals(order.getPlanWorkshop())) {
@ -156,6 +157,11 @@ public class EquOrderServiceImpl implements IEquOrderService {
} }
} }
order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode())); order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode()));
// 设置计划名称
String planName = equOrderMapper.selectPlanNameByPlanCode(order.getPlanCode());
if (planName!=null) {
order.setPlanName(planName);
}
} }
return orderList; return orderList;
} }

@ -106,6 +106,7 @@
<if test="orderEndArrayEnd != null "> and #{orderEndArrayEnd} >= CONVERT(date,order_end)</if> <if test="orderEndArrayEnd != null "> and #{orderEndArrayEnd} >= CONVERT(date,order_end)</if>
and del_flag = '0' and del_flag = '0'
</where> </where>
order by create_time desc
</select> </select>
<select id="selectEquOrderByOrderCode" parameterType="String" resultMap="EquOrderResult"> <select id="selectEquOrderByOrderCode" parameterType="String" resultMap="EquOrderResult">

Loading…
Cancel
Save