Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp
===================================================================
diff -u -r26409 -r26443
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 26409)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 26443)
@@ -21,6 +21,7 @@
 //设备型号
 var MARGE_MODEL_120 = '<%=DeviceInterface.MARGE_MODEL_120%>';
 var MARGE_MODEL_150 = '<%=DeviceInterface.MARGE_MODEL_150%>';
+var MARGE_MODEL_DRYER = '<%=DeviceInterface.MARGE_MODEL_DRYER%>';
 //设备品牌
 var CHANGLONG = '<%=DeviceInterface.CHANGLONG%>';
 var MARGE = '<%=DeviceInterface.MARGE%>';
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js
===================================================================
diff -u -r25677 -r26443
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js	(.../wahsDataChartOfMarge.js)	(revision 25677)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js	(.../wahsDataChartOfMarge.js)	(revision 26443)
@@ -16,6 +16,10 @@
 			$("#washData120").show();
 			loadformData('washData120')
 		break;
+		case margeModel_DRYER:
+			$("#washDataDryer").show();
+			loadformData('washDataDryer')
+		break;
 	default:
 		break;
 	}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java
===================================================================
diff -u -r26409 -r26443
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java	(.../WashAndDisinfectRecordController.java)	(revision 26409)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java	(.../WashAndDisinfectRecordController.java)	(revision 26443)
@@ -22,6 +22,7 @@
 import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifiedItemManager;
 import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifyBasketManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
+import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface;
 import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser;
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfMarge;
@@ -183,7 +184,7 @@
 	}
 	
 	/**
-	 * 获取美雅洁清洗机完成的参数
+	 * 获取美雅洁清洗机清洗参数
 	 * @return
 	 */
 	@RequestMapping(value = "/loadWashDataOfMargeByWashAndDisinfectRecordId")
@@ -192,20 +193,9 @@
 		JSONObject data = null;
 		JSONObject result = null;
 		try {
-			WashAndDisinfectRecord wd = washAndDisinfectRecordManager.get(id);
-			Rinser rs = (Rinser)objectDao.getByProperty(Rinser.class.getSimpleName(), "id", wd.getRinserId());
-			if(wd != null && rs != null){
-				//获取美雅洁清洗机数据(状态为完成或失败)
-				String hql = String.format(
-					"where po.deviceInterfaceID = '%s' and po.machineNo = '%s' and po.cycleCounter = '%s' "
-					+ " and (po.washStatus = '%s' or po.washStatus = '%s')" 
-					,rs.getDeviceInterfaceId(),rs.getMachineNumber(),wd.getCycleCounter(),
-					WashAndDisinfectRecord.STATUS_WASHED,WashAndDisinfectRecord.STATUS_WASHFAILD
-				);
-				WashDataOfMarge washData = (WashDataOfMarge) objectDao.getBySql(WashDataOfMarge.class.getSimpleName(), hql);
-				if(null != washData){
-					 data = JSONObject.fromObject(washData);
-				}
+			WashDataOfMarge washData = washAndDisinfectRecordManager.loadWashDataOfMargeByWashAndDisinfectRecordId(id);
+			if(null != washData){
+				 data = JSONObject.fromObject(washData);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp
===================================================================
diff -u -r26409 -r26443
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp	(.../wahsDataChartOfMarge.jsp)	(revision 26409)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp	(.../wahsDataChartOfMarge.jsp)	(revision 26443)
@@ -23,6 +23,7 @@
 	//设备型号
 	var margeModel_150 = "<%=DeviceInterface.MARGE_MODEL_150%>";
 	var margeModel_120 = "<%=DeviceInterface.MARGE_MODEL_120%>";
+	var margeModel_DRYER = "<%=DeviceInterface.MARGE_MODEL_DRYER%>";
 </script>
 
 <style type="text/css">
@@ -131,6 +132,40 @@
 				</tr>
 	    	</table>
 	    </form>
+	    <!--美雅洁干燥机参数-->
+		<form id="washDataDryer" style="display:none">
+	    	<table cellpadding="3">
+	    		<tr>
+	    			<td><span class="fieldName">程序名称：</span><input readonly ="true"  type="text" name="methodName" class="fieldValue"/></td>
+	    			<td><span class="fieldName">程序编号：</span><input readonly ="true"  type="text" name="methodNumber" class="fieldValue"/></td>
+	    			<td><span class="fieldName">操作员：</span><input readonly ="true"  type="text" name="operation" class="fieldValue"/></td>
+	    		</tr>
+	    		<tr>
+	    			<td><span class="fieldName">序列号：</span><input readonly ="true"  type="text" name="serialNumber" class="fieldValue"/></td>
+	    			<td><span class="fieldName">运行次数：</span><input readonly ="true"  type="text" name="cycleCounter" class="fieldValue"/></td>
+	    			<td><span class="fieldName">主槽温度(°C)：</span><input readonly ="true"  type="text" name="dryTemp" class="fieldValue"/></td>
+	    		</tr>
+	    		<tr>
+	    			<td><span class="fieldName">一级抽真空时间(秒)：</span><input readonly ="true"  type="text" name="firstLevelPumpdownTime" class="fieldValue"/></td>
+	    			<td><span class="fieldName">二级抽真空时间(秒)：</span><input readonly ="true"  type="text" name="secondLevelPumpdownTime" class="fieldValue"/></td>
+	    			<td><span class="fieldName">三级抽真空时间(秒)：</span><input readonly ="true"  type="text" name="thirdLevelPumpdownTime" class="fieldValue"/></td>
+	    		</tr>
+	    		<tr>
+	    			<td><span class="fieldName">四级抽真空时间(秒)：</span><input readonly ="true"  type="text" name="fourthLevelPumpdownTime" class="fieldValue"/></td>
+	    			<td><span class="fieldName">一级气破时间(秒)：</span><input readonly ="true"  type="text" name="firstLevelQiPoTime" class="fieldValue"/></td>
+	    			<td><span class="fieldName">二级气破时间(秒)：</span><input readonly ="true"  type="text" name="secondLevelQiPoTime" class="fieldValue"/></td>
+	    		</tr>
+	    		<tr>
+	    			<td><span class="fieldName">三级气破时间(秒)：</span><input readonly ="true"  type="text" name="thirdLevelQiPoTime" class="fieldValue"/></td>
+	    			<td><span class="fieldName">四级气破时间(秒)：</span><input readonly ="true"  type="text" name="fourthLevelQiPoTime" class="fieldValue"/></td>
+	    			<td><span class="fieldName">运行时间(分)：</span><input readonly ="true"  type="text" name="runTime" class="fieldValue"/></td>
+	    		</tr>
+	    		<tr>
+	    			<td><span class="fieldName">启动时间：</span><input readonly ="true"  type="text" name="startTime" class="fieldValue"/></td>
+	    			<td><span class="fieldName">停止时间(时:分:秒)：</span><input readonly ="true"  type="text" name="endTime" class="fieldValue"/></td>
+	    		</tr>
+	    	</table>
+	    </form>
 	    <!-- </div> -->
 	</div>
 </body>
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
===================================================================
diff -u -r26288 -r26443
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java	(.../WashAndDisinfectRecordManager.java)	(revision 26288)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java	(.../WashAndDisinfectRecordManager.java)	(revision 26443)
@@ -15,6 +15,7 @@
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataItemOfChangLong;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfChangLong;
+import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfMarge;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectPic;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial;
@@ -305,4 +306,10 @@
 	 */
 	void deleteWashAndDisinfectPicturesById(String picId);
 	/*******************/
+	
+	/**
+	 * 获取美雅洁清洗机清洗参数
+	 * @return
+	 */
+	public WashDataOfMarge loadWashDataOfMargeByWashAndDisinfectRecordId (String washAndDisinfectRecordId);
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java
===================================================================
diff -u -r26409 -r26443
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(.../MeiYaJieDataManagerImpl.java)	(revision 26409)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(.../MeiYaJieDataManagerImpl.java)	(revision 26443)
@@ -49,6 +49,18 @@
 			if(StringUtils.isBlank(ip)||StringUtils.isBlank(deviceIdStr)||StringUtils.isBlank(model)){
 				throw new RuntimeException(String.format("参数ip地址：%s,设备id：%s,设备类型：%s 不能为空！",ip,deviceIdStr,model));
 			}
+			// 获取美雅洁干燥柜数据
+			if (DeviceInterface.MARGE_MODEL_DRYER.equals(model)) {
+				logger.debug("开始获取干燥柜参数");
+				//1）、获取美雅洁清洗机的完成数据
+				JSONObject resultData = modbusControllerManager.getWashModbusDataByMeiYaJie(ip, post, deviceIdStr,model,timeoutSeconds);
+				WashDataOfMarge washDataOfMarge = (WashDataOfMarge) JSONObject.toBean(resultData, WashDataOfMarge.class);
+				//2）、设置：WashDataOfMarge
+				settingDryDataItemOfMarge(washDataOfMarge,washData,devInteface,washAndDisinfectRecord);
+				//3）、保存：美雅洁清洗机的完成数据
+				saveOrUpdateWashDataOfMarge(washAndDisinfectRecord,washDataOfMarge);
+				return;
+			}
 			//1、获取美雅洁清洗机清洗参数：完成标志
 			String completeSign = modbusControllerManager.getWashStrutsModbusDataByMeiYaJie(ip, post, deviceIdStr,model,timeoutSeconds);
 			//2-1、若清洗机标志为完成、失败则:保存获取该清洗机的完成数据
@@ -138,18 +150,18 @@
 		String dailyFrequency = washDataItemOfMarge.getDailyFrequency();//日计次数
 		String serialNumber  = null;//序列号
 		try {
-		    int startDayInt = Integer.parseInt(startDay);
-		    int dailyFrequencyInt = Integer.parseInt(dailyFrequency);
-		    StringBuffer serialNumberSB = new StringBuffer(startYear+startMonth);
-		    if(startDayInt < 10){
-		    	serialNumberSB.append("0");
-		    }
-		    //启动日*1000+日计次数
-		    serialNumberSB.append(Math.addExact(Math.multiplyExact(startDayInt,1000),dailyFrequencyInt));
-		    serialNumber = serialNumberSB.toString();
+			int startDayInt = Integer.parseInt(startDay);
+			int dailyFrequencyInt = Integer.parseInt(dailyFrequency);
+			StringBuffer serialNumberSB = new StringBuffer(startYear+startMonth);
+			if(startDayInt < 10){
+				serialNumberSB.append("0");
+			}
+			//启动日*1000+日计次数
+			serialNumberSB.append(Math.addExact(Math.multiplyExact(startDayInt,1000),dailyFrequencyInt));
+			serialNumber = serialNumberSB.toString();
 		} catch (NumberFormatException e) {
-		    e.printStackTrace();
-		    throw new RuntimeException(String.format("创建序列号失败！", e.getMessage()));
+			e.printStackTrace();
+			throw new RuntimeException(String.format("创建序列号失败！", e.getMessage()));
 		}
 
 		//3、清洗状态
@@ -173,6 +185,55 @@
 		washDataItemOfMarge.setMethodName(washAndDisinfectRecord.getDisinfectProgram());//清洗程序名
 	}
 
+	/**
+	 * 
+	 */
+	private void settingDryDataItemOfMarge(WashDataOfMarge washDataItemOfMarge,WashData washData,DeviceInterface devInteface,WashAndDisinfectRecord washAndDisinfectRecord) {
+		//1、启动时间
+		String startYear = getDateStr(washDataItemOfMarge.getStartYear());
+		String startMonth = getDateStr(washDataItemOfMarge.getStartMonth());
+		String startDay = getDateStr(washDataItemOfMarge.getStartDay());
+		String startHour = getDateStr(washDataItemOfMarge.getStartHour());
+		String startMinute = getDateStr(washDataItemOfMarge.getStartMinute());
+		String startSecond = getDateStr(washDataItemOfMarge.getStartSecond());
+		String startTime = startYear + "-" + startMonth + "-" + startDay + " " +startHour + ":" + startMinute + ":" + startSecond;
+
+		//2、停止时间
+		String endHour = washDataItemOfMarge.getEndHour();
+		String endMunite = washDataItemOfMarge.getEndMunite();
+		String endSecond = washDataItemOfMarge.getEndSecond();
+		String endTime = String.format("%s:%s:%s",endHour,endMunite,endSecond);
+		// String serialNumber  = washDataItemOfMarge.getSerialNumber();//序列号
+		
+		//4、序列号
+		String dailyFrequency = washDataItemOfMarge.getCycleCounter().toString();//日计次数
+		String serialNumber  = null;//序列号
+		try {
+			int startDayInt = Integer.parseInt(startDay);
+			int dailyFrequencyInt = Integer.parseInt(dailyFrequency);
+			StringBuffer serialNumberSB = new StringBuffer(startYear+startMonth);
+			if(startDayInt < 10){
+				serialNumberSB.append("0");
+			}
+			//启动日*1000+日计次数
+			serialNumberSB.append(Math.addExact(Math.multiplyExact(startDayInt,1000),dailyFrequencyInt));
+			serialNumber = serialNumberSB.toString();
+		} catch (NumberFormatException e) {
+			e.printStackTrace();
+			throw new RuntimeException(String.format("创建序列号失败！", e.getMessage()));
+		}
+
+		washDataItemOfMarge.setStartTime(startTime);//启动时间
+		washDataItemOfMarge.setEndTime(endTime);//停止时间
+		washDataItemOfMarge.setSerialNumber(serialNumber);//序列号
+		// washDataItemOfMarge.setWashStatus(washStatus);//清洗状态
+		washDataItemOfMarge.setMachineNo(washData.getMachineNo());//机器号
+		washDataItemOfMarge.setCycleCounter(washData.getCycleCounter());//循环次数
+		washDataItemOfMarge.setDeviceInterfaceID(devInteface.getId());//设备接口
+		washDataItemOfMarge.setOperation(washAndDisinfectRecord.getOperator());//操作员
+		washDataItemOfMarge.setMethodName(washAndDisinfectRecord.getDisinfectProgram());//清洗程序名
+	}
+
 //	private void settingWashData(WashDataOfMarge washDataItemOfMarge,WashData washData,String model){
 //		switch (model) {
 //		//150型号美雅洁清洗机
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
===================================================================
diff -u -r26409 -r26443
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java	(.../DeviceInterface.java)	(revision 26409)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java	(.../DeviceInterface.java)	(revision 26443)
@@ -70,6 +70,11 @@
 	 * 美雅洁,设备型号:150
 	 */
 	public static final String MARGE_MODEL_150 = "150";
+	
+	/**
+	 * 美雅洁干燥柜
+	 */
+	public static final String MARGE_MODEL_DRYER = "DRYER";
 
 	private Long id;
 	
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java
===================================================================
diff -u -r26409 -r26443
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java	(.../ModbusControllerManager.java)	(revision 26409)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java	(.../ModbusControllerManager.java)	(revision 26443)
@@ -72,6 +72,14 @@
 						reusltData.put(entry.getKey(), setAntReponse);
 					}
 				}
+				// 美雅洁干燥柜
+				else if(DeviceInterface.MARGE_MODEL_DRYER.equals(model)){
+					for (Map.Entry<String, Byte> entry: WashDataOfMarge.WASHDATA_MARGEDRYER_ADDRESS_XJJQ.entrySet()) {
+						logger.debug(String.format("开始获取,美雅洁干燥柜数据:%s ====》",entry.getKey()));
+						String setAntReponse = sendCommandAndGetData_MeiYaJie(deviceIdStr,entry.getValue());
+						reusltData.put(entry.getKey(), setAntReponse);
+					}
+				}
 				else {
 					throw new RuntimeException(String.format("美雅洁:%s设备类型不属于%s或%s",
 							DeviceInterface.MARGE_MODEL_150,DeviceInterface.MARGE_MODEL_120,model));
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
===================================================================
diff -u -r26409 -r26443
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 26409)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 26443)
@@ -259,7 +259,7 @@
 	}else if(deviceBrand == MARGE){
 		var margeModelComboStore = new Ext.data.SimpleStore({
 			fields : [ 'value' ],
-			data : [[MARGE_MODEL_120],[ MARGE_MODEL_150]]
+			data : [[MARGE_MODEL_120],[ MARGE_MODEL_150],[MARGE_MODEL_DRYER]]
 		})
 		showCmt('deviceIdWrap','deviceId',false);
 		showCmt('portWrap','port',false);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge.java
===================================================================
diff -u -r26416 -r26443
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge.java	(.../WashDataOfMarge.java)	(revision 26416)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge.java	(.../WashDataOfMarge.java)	(revision 26443)
@@ -54,6 +54,11 @@
 	 */
 	public static final Map<String,Byte> WASHDATA_MARGE120_ADDRESS_XJJQ = new LinkedHashMap<String, Byte>();
 	
+	/**
+	 * 美雅洁干燥柜：各命令初始地址集合
+	 */
+	public static final Map<String,Byte> WASHDATA_MARGEDRYER_ADDRESS_XJJQ = new LinkedHashMap<String, Byte>();
+	
 	static{
 		//美雅洁150：各命令初始地址//
 		WASHDATA_MARGE150_ADDRESS_XJJQ.put("startYear", (byte)0x00);				     //启动年
@@ -113,7 +118,31 @@
 		WASHDATA_MARGE120_ADDRESS_XJJQ.put("a0",(byte)0x1C);						//A0值
 		WASHDATA_MARGE120_ADDRESS_XJJQ.put("dailyFrequency", (byte)0x1D);		//日计次数
 		
-		
+		//美雅洁干燥柜：各命令初始地址//
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("methodNumber", (byte)0x00);	//程序编号
+		// WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("procedure", (byte)0x01);		//步骤
+		// WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("actualTime", (byte)0x02);		//实际时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("dryTemp", (byte)0x03);		//主槽设定温度
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("runTime", (byte)0x04);		//运行时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("cycleCounter", (byte)0x05);	//运行次数
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("startYear", (byte)0x06);		//启动年
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("startMonth", (byte)0x07);		//启动月
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("startDay", (byte)0x08);		//启动日
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("startHour", (byte)0x09);		//启动时
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("startMinute", (byte)0x0A);	//启动分
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("startSecond", (byte)0x0B);	//启动秒
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("endHour", (byte)0x0C);		//停止时
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("endMunite", (byte)0x0D);		//停止分
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("endSecond", (byte)0x0E);		//停止秒
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("firstLevelPumpdownTime", (byte)0x0F);		//一级抽真空设定时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("secondLevelPumpdownTime", (byte)0x10);	//二级抽真空设定时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("thirdLevelPumpdownTime", (byte)0x11);		//三级抽真空设定时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("fourthLevelPumpdownTime", (byte)0x12);	//四级抽真空设定时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("firstLevelQiPoTime", (byte)0x13);			//一级抽气破设定时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("secondLevelQiPoTime", (byte)0x14);		//二级抽气破设定时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("thirdLevelQiPoTime", (byte)0x15);			//三级抽气破设定时间
+		WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("fourthLevelQiPoTime", (byte)0x16);		//四级抽气破设定时间
+		// WASHDATA_MARGEDRYER_ADDRESS_XJJQ.put("serialNumber", (byte)0x17);				//序列号
 	}
 	
 	/*****************************/
@@ -128,7 +157,7 @@
 	private String machineNo;
 	
 	/**
-	 * 循环次数(程序完成总次数)
+	 * 循环次数(程序完成总次数)/运行次数(干燥柜)
 	 */
 	private Long cycleCounter;
 	
@@ -311,7 +340,7 @@
 	private  String drySecond;
 	
 	/**
-	 * 干燥温度
+	 * 干燥温度/主槽温度(干燥柜)
 	 */
 	private  String dryTemp;
 	
@@ -350,6 +379,45 @@
 	 */
 	private String a0;
 	
+	/**
+	 * 美雅洁干燥柜 
+	 * 
+	 * 运行时间
+	 */
+	private String runTime;
+	/**
+	 * 一级抽真空时间
+	 */
+	private String firstLevelPumpdownTime;
+	/**
+	 * 二级抽真空时间
+	 */
+	private String secondLevelPumpdownTime;
+	/**
+	 * 三级抽真空时间
+	 */
+	private String thirdLevelPumpdownTime;
+	/**
+	 * 四级抽真空时间
+	 */
+	private String fourthLevelPumpdownTime;
+	/**
+	 * 一级气破时间
+	 */
+	private String firstLevelQiPoTime;
+	/**
+	 * 一级气破时间
+	 */
+	private String secondLevelQiPoTime;
+	/**
+	 * 一级气破时间
+	 */
+	private String thirdLevelQiPoTime;
+	/**
+	 * 一级气破时间
+	 */
+	private String fourthLevelQiPoTime;
+	
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -735,4 +803,76 @@
 	public void setA0(String a0) {
 		this.a0 = a0;
 	}
+
+	public String getRunTime() {
+		return runTime;
+	}
+
+	public void setRunTime(String runTime) {
+		this.runTime = runTime;
+	}
+
+	public String getFirstLevelPumpdownTime() {
+		return firstLevelPumpdownTime;
+	}
+
+	public void setFirstLevelPumpdownTime(String firstLevelPumpdownTime) {
+		this.firstLevelPumpdownTime = firstLevelPumpdownTime;
+	}
+
+	public String getSecondLevelPumpdownTime() {
+		return secondLevelPumpdownTime;
+	}
+
+	public void setSecondLevelPumpdownTime(String secondLevelPumpdownTime) {
+		this.secondLevelPumpdownTime = secondLevelPumpdownTime;
+	}
+
+	public String getThirdLevelPumpdownTime() {
+		return thirdLevelPumpdownTime;
+	}
+
+	public void setThirdLevelPumpdownTime(String thirdLevelPumpdownTime) {
+		this.thirdLevelPumpdownTime = thirdLevelPumpdownTime;
+	}
+
+	public String getFourthLevelPumpdownTime() {
+		return fourthLevelPumpdownTime;
+	}
+
+	public void setFourthLevelPumpdownTime(String fourthLevelPumpdownTime) {
+		this.fourthLevelPumpdownTime = fourthLevelPumpdownTime;
+	}
+
+	public String getFirstLevelQiPoTime() {
+		return firstLevelQiPoTime;
+	}
+
+	public void setFirstLevelQiPoTime(String firstLevelQiPoTime) {
+		this.firstLevelQiPoTime = firstLevelQiPoTime;
+	}
+
+	public String getSecondLevelQiPoTime() {
+		return secondLevelQiPoTime;
+	}
+
+	public void setSecondLevelQiPoTime(String secondLevelQiPoTime) {
+		this.secondLevelQiPoTime = secondLevelQiPoTime;
+	}
+
+	public String getThirdLevelQiPoTime() {
+		return thirdLevelQiPoTime;
+	}
+
+	public void setThirdLevelQiPoTime(String thirdLevelQiPoTime) {
+		this.thirdLevelQiPoTime = thirdLevelQiPoTime;
+	}
+
+	public String getFourthLevelQiPoTime() {
+		return fourthLevelQiPoTime;
+	}
+
+	public void setFourthLevelQiPoTime(String fourthLevelQiPoTime) {
+		this.fourthLevelQiPoTime = fourthLevelQiPoTime;
+	}
 }
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r26409 -r26443
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 26409)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 26443)
@@ -116,6 +116,8 @@
 public class WashAndDisinfectRecordManagerImpl extends BasePoManagerImpl<WashAndDisinfectRecord> implements
 		WashAndDisinfectRecordManager {
 
+	private WashAndDisinfectRecordManager washAndDisinfectRecordManager;
+	
 	private BeCleanItemManager beCleanItemManager;
 	
 	private ClassifyBasketManager classifyBasketManager;
@@ -162,7 +164,12 @@
 	
 	@Autowired(required = false)
 	private DeviceDataByCommunicationManager deviceDataByCommunicationManager;
-	
+
+	public void setWashAndDisinfectRecordManager(
+			WashAndDisinfectRecordManager washAndDisinfectRecordManager) {
+		this.washAndDisinfectRecordManager = washAndDisinfectRecordManager;
+	}
+
 	public void setIdCardDefinitionManager(
 			IDCardDefinitionManager idCardDefinitionManager) {
 		this.idCardDefinitionManager = idCardDefinitionManager;
@@ -3007,6 +3014,21 @@
 					xyAxisDataArray.add(xyAxisData);
 				}
 				break;
+			//美雅洁干燥柜
+			case DeviceInterface.MARGE_MODEL_DRYER:
+				legendDataArray.add("主槽温度");
+				for (WashDataOfMarge washData : margeWashDataList) {
+					JSONObject tempData = new JSONObject();
+					tempData.put("name", "主槽温度");
+					tempData.put("value", washData.getDryTemp());
+					JSONArray yAxisDataArray = new JSONArray();
+					yAxisDataArray.add(tempData);
+					JSONObject xyAxisData = new JSONObject();
+					xyAxisData.put("xAxisData", washData.getTime());//
+					xyAxisData.put("yAxisData", yAxisDataArray);
+					xyAxisDataArray.add(xyAxisData);
+				}
+				break;
 			default:
 				throw new RuntimeException(String.format("暂不支持设备类型：", deviceModel));
 			}
@@ -3195,4 +3217,31 @@
         objectDao.delete(picture);
     }
   //****************************//
+
+	@Override
+	public WashDataOfMarge loadWashDataOfMargeByWashAndDisinfectRecordId(String washAndDisinfectRecordId) {
+		if (DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)) {
+			WashAndDisinfectRecord wd = washAndDisinfectRecordManager.get(washAndDisinfectRecordId);
+			Rinser rs = (Rinser)objectDao.getByProperty(Rinser.class.getSimpleName(), "id", wd.getRinserId());
+			if(wd != null && rs != null){
+				String hql = null;
+				if (DeviceInterface.MARGE_MODEL_DRYER.equals(rs.getDeviceInterface().getDeviceModel())) {
+					//获取美雅洁干燥柜数据
+					hql = String.format("where po.deviceInterfaceID = '%s' and po.machineNo = '%s' and po.cycleCounter = '%s' order by po.id desc",
+							rs.getDeviceInterfaceId(),rs.getMachineNumber(),wd.getCycleCounter());
+				} else {
+					//获取美雅洁清洗机数据(状态为完成或失败)
+					hql = String.format(
+							"where po.deviceInterfaceID = '%s' and po.machineNo = '%s' and po.cycleCounter = '%s' "
+									+ " and (po.washStatus = '%s' or po.washStatus = '%s')" 
+									,rs.getDeviceInterfaceId(),rs.getMachineNumber(),wd.getCycleCounter(),
+									WashAndDisinfectRecord.STATUS_WASHED,WashAndDisinfectRecord.STATUS_WASHFAILD
+							);
+				}
+				WashDataOfMarge washData = (WashDataOfMarge) objectDao.getBySql(WashDataOfMarge.class.getSimpleName(), hql);
+				return washData;
+			}
+		}
+		return null;
+	}
 }