Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增字段 基础信息设备：设备类别 设备维修：设备状态描述

Browse Source
master
A0010407 2 years ago
parent b9a9d5c6f0
commit 4368b922d9
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File

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

@ -139,6 +139,9 @@ public class EquRepairWorkOrder extends BaseEntity {
/** 联系方式 */
private String workConnection;
/** 设备状态描述 */
private String equipmentStatusDescription;
// 设备
/** 设备名称 */
@Excel(name = "设备名称")
@ -722,6 +725,14 @@ public class EquRepairWorkOrder extends BaseEntity {
this.faultType = faultType;
}
//设备状态描述
public String getEquipmentStatusDescription() {
return equipmentStatusDescription;
}
public void setEquipmentStatusDescription(String equipmentStatusDescription) {
this.equipmentStatusDescription = equipmentStatusDescription;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@ -41,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" />
<result property="factoryCode" column="factory_code" />
<result property="faultType" column="fault_type" />
<result property="equipmentStatusDescription" column="equipment_status_description" />
<!--设备-->
<result property="equipmentName" column="equipment_name" />
<result property="equipmentSpec" column="equipment_spec" />
@ -85,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</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 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 from equ_repair_work_order
</sql>
<select id="selectEquRepairWorkOrderList" parameterType="EquRepairWorkOrder" resultMap="EquRepairWorkOrderResult">
@ -125,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.del_flag,
erwo.factory_code,
erwo.fault_type,
erwo.equipment_status_description,
be.equipment_name,
et.team_name,
et.team_person
@ -204,6 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.del_flag,
erwo.factory_code,
erwo.fault_type,
erwo.equipment_status_description,
be.equipment_name,
et.team_name,
et.team_person
@ -252,6 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.update_by,
erwo.factory_code,
erwo.fault_type,
erwo.equipment_status_description,
be.equipment_name,
be.equipment_spec,
be.equipment_type_name,
@ -316,6 +321,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null">del_flag,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="faultType != null">fault_type,</if>
<if test="equipmentStatusDescription != null">equipment_status_description,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workId != null">#{workId},</if>
@ -353,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null">#{delFlag},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="faultType != null">#{fault_type},</if>
<if test="equipmentStatusDescription != null">equipment_status_description,</if>
</trim>
</insert>
@ -393,6 +400,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="faultType != null">fault_type = #{faultType},</if>
<if test="equipmentStatusDescription != null">equipment_status_description = #{equipmentStatusDescription},</if>
</trim>
where work_id = #{workId}
and del_flag = '0'

12
op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java
Unescape Escape View File

@ -211,6 +211,10 @@ public class BaseEquipment extends BaseEntity {
@Excel(name = "设备状态")
private String equipmentStatus;
/** 设备类别 */
@Excel(name = "设备类别")
private String equipmentCategory;
private String imageFileList;
private String barCodeFileList;
@ -651,6 +655,14 @@ public class BaseEquipment extends BaseEntity {
return equipmentStatus;
}
//设备类别
public void setEquipmentCategory(String equipmentCategory) {
this.equipmentCategory = equipmentCategory;
}
public String getEquipmentCategory() {
return equipmentCategory;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

8
op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
Unescape Escape View File

@ -48,6 +48,7 @@
<result property="equipmentHead" column="equipment_head" />
<result property="factoryCode" column="factory_code" />
<result property="equipmentStatus" column="equipment_status" />
<result property="equipmentCategory" column="equipment_category" />
</resultMap>
<resultMap type="WmsSparePartsLedger" id="WmsSparePartsLedgerResult">
@ -162,7 +163,8 @@
department,
equipment_head,
factory_code,
equipment_status
equipment_status,
equipment_category
from base_equipment
</sql>
@ -205,6 +207,7 @@
<if test="sapAsset != null and sapAsset != ''"> and sap_asset = #{sapAsset}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="equipmentStatus != null and equipmentStatus != ''"> and equipment_status = #{equipmentStatus}</if>
<if test="equipmentCategory != null and equipmentCategory != ''"> and equipment_category = #{equipmentCategory}</if>
and del_flag ='0'
</where>
</select>
@ -259,6 +262,7 @@
<if test="equipmentHead != null">equipment_head,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="equipmentStatus != null">equipment_status,</if>
<if test="equipmentCategory != null">equipment_category,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
@ -302,6 +306,7 @@
<if test="equipmentHead != null">#{equipmentHead},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="equipmentStatus != null">equipmentStatus,</if>
<if test="equipmentCategory != null">equipmentCategory,</if>
</trim>
</insert>
@ -349,6 +354,7 @@
<if test="equipmentHead != null">equipment_head = #{equipmentHead},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="equipmentStatus != null">equipment_status = #{equipmentStatus},</if>
<if test="equipmentCategory != null">equipment_category = #{equipmentCategory},</if>
</trim>
where equipment_id = #{equipmentId}
</update>

Write Preview
Loading…
Cancel
Save