优化

src/main/java/com/jeesite/modules/mes/web/MesDeviceMaintenanceController.java

@@ -72,6 +72,16 @@ public class MesDeviceMaintenanceController extends BaseController {
 	}
 
 	/**
+	 * 查看详情
+	 */
+	@RequiresPermissions("mes:mesDeviceMaintenance:view")
+	@RequestMapping(value = "info")
+	public String info(MesDeviceMaintenance mesDeviceMaintenance, Model model) {
+		model.addAttribute("mesDeviceMaintenance", mesDeviceMaintenance);
+		return "modules/mes/mesDeviceMaintenanceInfo";
+	}
+
+	/**
 	 * 保存数据
 	 */
 	@RequiresPermissions("mes:mesDeviceMaintenance:edit")

src/main/java/com/jeesite/modules/mes/web/MesRepairController.java

@@ -594,7 +594,8 @@ public class MesRepairController extends BaseController {
 		resp.setResult(Global.FALSE);
 		String sn = req.getParameter("sn");
 		String lineSn = req.getParameter("lineSn");
-		String fxOprno = req.getParameter("fxOprno");
+		String fxOprno="XT";
+//		String fxOprno = req.getParameter("fxOprno");
 		String oprno = req.getParameter("oprno");
 		String itemId = req.getParameter("itemId");
 		String remark = req.getParameter("remark");

src/main/resources/views/modules/mes/mesDeviceMaintenanceInfo.html

@@ -0,0 +1,110 @@
+<% layout('/layouts/default.html', {title: '设备维保记录详情', libs: []}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header with-border">
+			<div class="box-title">
+				<i class="fa icon-note"></i> ${text('设备维保记录详情')}
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+		<div class="box-body">
+			<div class="form-unit">${text('基本信息')}</div>
+			<table class="table table-bordered">
+				<tr>
+					<th class="mpc-header">${text('维保日期')}</th>
+					<td>${@DateUtils.formatDate(mesDeviceMaintenance.maintenanceDate, 'yyyy-MM-dd')}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('设备名称')}</th>
+					<td>${mesDeviceMaintenance.deviceName}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('机台号')}</th>
+					<td>${mesDeviceMaintenance.deviceCode}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('故障类别')}</th>
+					<td>${mesDeviceMaintenance.faultCategory}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('维修人')}</th>
+					<td>${mesDeviceMaintenance.repairUser}</td>
+				</tr>
+			</table>
+
+			<div class="form-unit">${text('故障与停机信息')}</div>
+			<table class="table table-bordered">
+				<tr>
+					<th class="mpc-header">${text('故障发生时间')}</th>
+					<td>${@DateUtils.formatDateTime(mesDeviceMaintenance.faultTime)}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('恢复生产时间')}</th>
+					<td>${@DateUtils.formatDateTime(mesDeviceMaintenance.resumeProductionTime)}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('停机时长')}</th>
+					<td>${mesDeviceMaintenance.downtime}</td>
+				</tr>
+			</table>
+
+			<div class="form-unit">${text('维修作业信息')}</div>
+			<table class="table table-bordered">
+				<tr>
+					<th class="mpc-header">${text('维修开始时间')}</th>
+					<td>${@DateUtils.formatDateTime(mesDeviceMaintenance.repairStartTime)}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('维修结束时间')}</th>
+					<td>${@DateUtils.formatDateTime(mesDeviceMaintenance.repairEndTime)}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('维修时长')}</th>
+					<td>${mesDeviceMaintenance.repairDuration}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('备件名称')}</th>
+					<td>${mesDeviceMaintenance.sparePartName}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('数量')}</th>
+					<td>${mesDeviceMaintenance.quantity}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('故障现象')}</th>
+					<td>${mesDeviceMaintenance.faultPhenomenon}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('维修措施')}</th>
+					<td>${mesDeviceMaintenance.repairMeasure}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('根本原因分析')}</th>
+					<td>${mesDeviceMaintenance.rootCauseAnalysis}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('备注')}</th>
+					<td>${mesDeviceMaintenance.remarks}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('创建时间')}</th>
+					<td>${@DateUtils.formatDateTime(mesDeviceMaintenance.createDate)}</td>
+				</tr>
+				<tr>
+					<th class="mpc-header">${text('更新时间')}</th>
+					<td>${@DateUtils.formatDateTime(mesDeviceMaintenance.updateDate)}</td>
+				</tr>
+			</table>
+		</div>
+		<div class="box-footer">
+			<div class="row">
+				<div class="col-sm-offset-2 col-sm-10">
+					<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<% } %>

src/main/resources/views/modules/mes/mesDeviceMaintenanceList.html

@@ -66,7 +66,9 @@ $('#dataGrid').dataGrid({
 		{header:'${text("维保日期")}', name:'maintenanceDate', index:'a.maintenance_date', width:110, align:"center", formatter: function(val){
 			return val ? val.substring(0,10) : '';
 		}},
-		{header:'${text("设备名称")}', name:'deviceName', index:'b.tree_name', width:150, align:"center"},
+		{header:'${text("设备名称")}', name:'deviceName', index:'b.tree_name', width:150, align:"center", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/mes/mesDeviceMaintenance/info?id='+row.id+'" class="btnList" data-title="${text("设备维保记录详情")}">'+(val||'')+'</a>';
+		}},
 		{header:'${text("机台号")}', name:'deviceCode', index:'b.device_code', width:120, align:"center"},
 		{header:'${text("故障发生时间")}', name:'faultTime', index:'a.fault_time', width:150, align:"center"},
 		{header:'${text("恢复生产时间")}', name:'resumeProductionTime', index:'a.resume_production_time', width:150, align:"center"},