维保记录

op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java

@@ -248,4 +248,24 @@ public class BaseEquipmentController extends BaseController {
 		return getDataTable(list);
 	}
 
+	/**
+	 * 查询维修记录
+	 */
+	@GetMapping("/getWXRecordsList")
+	public TableDataInfo getWXRecordsList(BaseEquipment baseEquipment) {
+		startPage();
+		List<BaseEquipment> list = baseEquipmentService.selectWXRecordsList(baseEquipment);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 查询保养记录
+	 */
+	@GetMapping("/getBYRecordsList")
+	public TableDataInfo getBYRecordsList(BaseEquipment baseEquipment) {
+		startPage();
+		List<BaseEquipment> list = baseEquipmentService.selectBYRecordsList(baseEquipment);
+		return getDataTable(list);
+	}
+
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java

@@ -1,11 +1,14 @@
 package com.op.wms.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.op.common.core.domain.BaseFileData;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.op.common.core.annotation.Excel;
 import com.op.common.core.web.domain.BaseEntity;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -259,6 +262,190 @@ public class BaseEquipment extends BaseEntity {
 	//返回已经绑定辅助设备列表
 	private List<EquBindAuxiliaryEquipment> selectedEquipmentData;
 
+/////////////////////////维修记录
+	/** 维修单号 */
+	private String workCode;
+
+	/** 维修人员 */
+	private String workPerson;
+
+	/** 维修组 */
+	private String workTeam;
+
+	/** 原因分析 */
+	private String workReason;
+
+	/** 故障描述 */
+	private String workFaultDesc;
+
+	/** 设备维修措施 */
+	private String repairMeasures;
+
+	/** 维修开始时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date workStartTime;
+
+	/** 维修结束时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date workEndTime;
+
+	/** 维修状态 */
+	private String workStatus;
+
+	/////////////////////////保养记录
+	/** 单号 */
+	private String orderCode;
+
+	/** 循环周期 */
+	private String planLoop;
+
+	/** 实际开始时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date orderStart;
+
+	/** 实际结束时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date orderEnd;
+
+	/** 工单状态 */
+	private String orderStatus;
+
+	/** 工单费用 */
+	private BigDecimal orderCost;
+
+	/** 责任人 */
+	private String planPerson;
+
+	/** 工单用时 */
+	private String orderCostTime;
+
+	/** 签字 */
+	private String orderSignPerson;
+///////////////////////////////////
+    public void setOrderCode(String orderCode) {
+	this.orderCode = orderCode;
+}
+	public String getOrderCode() {
+		return orderCode;
+	}
+
+	public void setPlanLoop(String planLoop) {
+		this.planLoop = planLoop;
+	}
+	public String getPlanLoop() {
+		return planLoop;
+	}
+
+	public void setOrderStart(Date orderStart) {
+		this.orderStart = orderStart;
+	}
+	public Date getOrderStart() {
+		return orderStart;
+	}
+
+	public void setOrderEnd(Date orderEnd) {
+		this.orderEnd = orderEnd;
+	}
+	public Date getOrderEnd() {
+		return orderEnd;
+	}
+
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public String getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderCost(BigDecimal orderCost) {
+		this.orderCost = orderCost;
+	}
+	public BigDecimal getOrderCost() {
+		return orderCost;
+	}
+
+	public void setPlanPerson(String planPerson) {
+		this.planPerson = planPerson;
+	}
+	public String getPlanPerson() {
+		return planPerson;
+	}
+
+	public void setOrderCostTime(String orderCostTime) {
+		this.orderCostTime = orderCostTime;
+	}
+	public String getOrderCostTime() {
+		return orderCostTime;
+	}
+
+	public void setOrderSignPerson(String orderSignPerson) {
+		this.orderSignPerson = orderSignPerson;
+	}
+	public String getOrderSignPerson() {
+		return orderSignPerson;
+	}
+    ///////////////////////////////
+	public String getRepairMeasures() {
+		return repairMeasures;
+	}
+	public void setRepairMeasures(String repairMeasures) { this.repairMeasures = repairMeasures; }
+
+	public void setWorkFaultDesc(String workFaultDesc) {
+		this.workFaultDesc = workFaultDesc;
+	}
+	public String getWorkFaultDesc() {
+		return workFaultDesc;
+	}
+
+	public void setWorkReason(String workReason) {
+		this.workReason = workReason;
+	}
+	public String getWorkReason() {
+		return workReason;
+	}
+
+	public void setWorkStatus(String workStatus) {
+		this.workStatus = workStatus;
+	}
+	public String getWorkStatus() {
+		return workStatus;
+	}
+
+	public void setWorkPerson(String workPerson) {
+		this.workPerson = workPerson;
+	}
+	public String getWorkPerson() {
+		return workPerson;
+	}
+
+	public void setWorkTeam(String workTeam) {
+		this.workTeam = workTeam;
+	}
+	public String getWorkTeam() {
+		return workTeam;
+	}
+
+	public void setWorkCode(String workCode) {
+		this.workCode = workCode;
+	}
+	public String getWorkCode() {
+		return workCode;
+	}
+
+	public void setWorkStartTime(Date workStartTime) {
+		this.workStartTime = workStartTime;
+	}
+	public Date getWorkStartTime() {
+		return workStartTime;
+	}
+
+	public void setWorkEndTime(Date workEndTime) {
+		this.workEndTime = workEndTime;
+	}
+	public Date getWorkEndTime() {
+		return workEndTime;
+	}
+
 	public void setSelectedEquipmentData(List<EquBindAuxiliaryEquipment> selectedEquipmentData) {
 		this.selectedEquipmentData = selectedEquipmentData;
 	}

op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java

@@ -120,4 +120,10 @@ public interface BaseEquipmentMapper {
 
 	//查询组线/辅助设备
 	List<BaseEquipment> selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment);
+
+	//查询维修记录
+    List<BaseEquipment> selectWXRecordsList(BaseEquipment baseEquipment);
+
+    //查询保养记录
+    List<BaseEquipment> selectBYRecordsList(BaseEquipment baseEquipment);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java

@@ -83,4 +83,10 @@ public interface IBaseEquipmentService {
 
 	//查询组线下的辅助设备
 	List<BaseEquipment> selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment);
+
+	//查询维修记录
+	List<BaseEquipment> selectWXRecordsList(BaseEquipment baseEquipment);
+
+	//查看保养记录
+	List<BaseEquipment> selectBYRecordsList(BaseEquipment baseEquipment);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java

@@ -569,4 +569,27 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 		return baseEquipmentMapper.selectAuxiliaryEquipmentList(equBindAuxiliaryEquipment);
 	}
 
+	/**
+	 * 查询维修记录
+	 *
+	 * @param baseEquipment
+	 * @return
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<BaseEquipment> selectWXRecordsList(BaseEquipment baseEquipment) {
+		return baseEquipmentMapper.selectWXRecordsList(baseEquipment);
+	}
+
+	/**
+	 * 查询保养记录
+	 *
+	 * @param baseEquipment
+	 * @return
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<BaseEquipment> selectBYRecordsList(BaseEquipment baseEquipment) {
+		return baseEquipmentMapper.selectBYRecordsList(baseEquipment);
+	}
 }

op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml

@@ -622,4 +622,38 @@
 		where ebac.equipment_code = #{equipmentCode}
 	</select>
 
+
+	<select id="selectWXRecordsList" parameterType="com.op.wms.domain.BaseEquipment" resultType="com.op.wms.domain.BaseEquipment">
+		select
+			work_code AS workCode,
+			work_person AS workPerson,
+			work_team AS workTeam,
+			work_reason AS workReason,
+            work_fault_desc AS workFaultDesc,
+	        repair_measures AS repairMeasures,
+            work_status AS workStatus,
+            work_start_time AS workStartTime,
+            work_end_time AS workEndTime
+        from equ_repair_work_order
+		where equipment_code = #{equipmentCode}
+		and del_flag = '0'
+	</select>
+
+	<select id="selectBYRecordsList" parameterType="com.op.wms.domain.BaseEquipment" resultType="com.op.wms.domain.BaseEquipment">
+		select
+        	order_code AS orderCode,
+            CONCAT(plan_loop, plan_loop_type) AS planLoop,
+            order_start AS orderStart,
+	        order_end AS orderEnd,
+            order_status AS orderStatus,
+            order_cost AS orderCost,
+            plan_person AS planPerson,
+            order_cost_time AS orderCostTime,
+            order_sign_person AS orderSignPerson
+        from equ_order
+		where equipment_code = #{equipmentCode}
+		and del_flag = '0'
+		and plan_type = 'maintenance'
+	</select>
+
 </mapper>