Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/recyclingDetailPrintConfig.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/recyclingDetailPrintConfig.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/recyclingDetailPrintConfig.js	(revision 33482)
@@ -0,0 +1,79 @@
+{
+    "headerContent" : //表格头定义
+    [
+         {"label" : "CSSD每日回收登记表", "dataIndex" : "", "fontSize" : 15, "position" : ["5","40%","99%",5]}, // 标题
+         {"label" : "制单人：", "dataIndex" : "applicant", "fontSize" : 11, "position" : ["35","2%","90%",5]},
+       	 {"label" : "开始时间：", "dataIndex" : "startTime", "fontSize" : 11, "position" : ["35","35%","90%",5]},
+         {"label" : "结束时间：", "dataIndex" : "endTime", "fontSize" : 11, "position" : ["35","75%","90%",5]}
+    ],
+   /* "tables": [ // 表格定义，数组类型，支持可以定义多个表格
+        {
+            "tableName": "表格1：手术器械", // 表格名称
+        	"rowHeight" : 24,
+            "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局
+            "departGroupsConfig": { // 科室分组配置
+                "showDepartGroupColumn": true, // 是否显示科室分组的表格列
+                "columnName":"科室分组", // 列的标题
+                "columnWidth": "50px", // 列的宽度
+                "departGroups": [ // 科室分组定义，可以定义多个科室分组
+                    {
+                        "id": 2, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id
+                        "departGroupName": "手术器械", // 科室分组的名称
+                        "showDepartGroupName": "麻醉科" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同
+                    }
+                ]
+            },
+            "departConfig": { // 科室配置
+                "columnName":"科室",
+                "columnWidth": "100px" // 科室列的宽度
+            },
+            "tousseColumnsConfig": [ // 表格的器械包列的设置
+                {
+                    "columnName":"器械包",
+                    "includeOtherTousses": true // 是否包含其它的器械包。值为true，表示要显示出其它表格列中没指定的所有其它的器械，用【名字  数量】方式展现
+                }
+            ]
+        }
+       
+       
+    ],*/
+    "tables": [ // 表格定义，数组类型，支持可以定义多个表格
+        {
+            "tableName": "表格2：手术器械2", // 表格名称
+        	"rowHeight" : 24,
+            "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局
+            "departGroupsConfig": { // 科室分组配置
+                "showDepartGroupColumn": true, // 是否显示科室分组的表格列
+                "columnName":"科室分组", // 列的标题
+                "columnWidth": "50px", // 列的宽度
+                "departGroups": [ // 科室分组定义，可以定义多个科室分组
+                    {
+                        "id": 2, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id
+                        "departGroupName": "手术器械", // 科室分组的名称
+                        "showDepartGroupName": "麻醉科" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同
+                    }
+                ]
+            },
+            "departConfig": { // 科室配置
+                "columnName":"科室",
+                "columnWidth": "100px" // 科室列的宽度
+            },
+            "tousseColumnsConfig": [ // 表格的器械包列的设置
+                {
+                    "columnName": "治疗碗",
+                    "includeTousse": [ // 要统计的器械包，支持统计多个包
+                        {
+                            "id": 284,
+                            "tousseName": "治疗碗"
+                        }
+                    ]
+                },{
+                    "columnName": "其它器械",
+                    "includeOtherTousses": true // 是否包含其它的器械包。值为true，表示要显示出其它表格列中没指定的所有其它的器械，用【名字  数量】方式展现
+                }]
+                
+        }
+       
+       
+    ]
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/interfaces/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(revision 33482)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao"> 
+ <!-- 按单号查找入库单 -->
+ <select id="findInEntryBySerialNumber" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_MaterialEntry
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+ </select>
+<!-- 按时间查找入库单 -->
+ <select id="findInEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_MaterialEntry
+	where 1=1
+	]]> 
+	<if test="startDate != null">
+		and time >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and time <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time	 
+  </select>
+<!-- 按单号查找入库单明细 -->
+<select id="findInEntryItem" resultType="StorageEntryItem">
+  	<![CDATA[
+	SELECT  
+	        inventorySerialNumber,
+			batchNumber,
+	        supplierName,
+	        quantity AS amount,
+	        expDate,
+	        cost AS unitPrice
+	FROM  CSSD_MaterialEntry t1
+	INNER JOIN CSSD_MaterialEntryItem t2 on t1.id = t2.materialEntryId
+	WHERE t1.serialNumber = #{inEntrySerialNumber}
+	]]>
+</select> 
+<!-- 按物资编码查找物资信息 -->
+<select id="getInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber,
+	    name,specification,unit
+		FROM CSSD_MaterialDefinition
+		WHERE serialNumber = #{inventorySerialNumber}
+	]]>
+</select> 
+<!-- 按名称规格查找物资信息 -->
+<select id="findInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber AS serialNumber,
+	       name,specification,unit
+	FROM CSSD_MaterialDefinition
+	WHERE name = #{name}
+	<choose>
+		<when test="specification != null">
+			AND specification = #{specification}
+		</when >
+		<otherwise>
+			AND ((specification is null) OR (specification =''))
+		</otherwise>
+	</choose>
+	]]<name />
+</select> 
+
+<!-- 按单号查找退库单 -->
+<select id="findOutEntryBySerialNumber" resultType="StorageEntry">
+	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_MaterialEntry
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+</select> 
+<!-- 按时间查找退库单 -->
+<select id="findOutEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM CSSD_GodownEntry
+	WHERE 1=1
+	]]>
+	<if test="startDate != null">
+		and time >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and time <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time
+ </select> 
+<!-- 按单号查找退库单明细 -->
+<select id="findOutEntryItem" resultType="StorageEntryItem">
+	<![CDATA[
+	SELECT   INVENTORYSERIALNUMBER,
+			BATCHNUMBER,
+	        SUPPLIERNAME,
+	        quantity AS amount,
+	        EXPDATE,
+	        cost AS unitPrice
+	FROM  CSSD_GodownEntry t1
+	INNER JOIN CSSD_MaterialEntryItem t2 on t1.id = t2.materialEntryId
+	WHERE t1.SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+</mapper> 
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/spring/HIS.xml
===================================================================
diff -u -r29796 -r33482
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/spring/HIS.xml	(.../HIS.xml)	(revision 29796)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/spring/HIS.xml	(.../HIS.xml)	(revision 33482)
@@ -84,5 +84,21 @@
     </bean>
     
     <bean id="sycnDataFromHIPDao" class="com.forgon.disinfectsystem.datasynchronization.dao.common.SycnDataFromHIPDaoImpl"></bean>
+        <!-- 史帝瑞清洗机接口 -->
+  
+  <bean id="sterisAMSCO3052DataManager"
+   parent="txProxyTemplate">
+        <property name="target">
+         
+   <ref bean="sterisAMSCO3052DataManagerTarget"/>
     
+    </property>
+  
+  </bean>
+  
+  <bean id="sterisAMSCO3052DataManagerTarget"
+  class="com.forgon.disinfectsystem.maintain.device.service.SterisAMSCO3052DataManagerImpl">
+
+ </bean>
+ <!-- 史帝瑞清洗机接口 -->
 </beans>
\ No newline at end of file