Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/interfaces/mybatis/SyncOperationReservation_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/interfaces/mybatis/SyncOperationReservation_Mapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/interfaces/mybatis/SyncOperationReservation_Mapper.xml	(revision 36233)
@@ -0,0 +1,61 @@
+<?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.InvoicePlanDao">
+	<!-- 结果集 -->
+	<resultMap id="queryForListMap" type="com.forgon.disinfectsystem.inventorymanagement.model.HrpInvoicePlan">
+		<result  column="ID" property="serialNumber" jdbcType="VARCHAR"/>
+		<result  column="OPERATION" property="operationName" jdbcType="VARCHAR"/>
+		<result  column="OPROOMID" property="operatingRoom" jdbcType="VARCHAR"/>
+		<result  column="SURGEON" property="doctors" jdbcType="VARCHAR"/>
+		<result  column="SCHEDULED_DATE_TIME" property="operationTime" jdbcType="TIMESTAMP"/>
+		<result  column="SCHEDULE_ID" property="scheduleId" jdbcType="VARCHAR"/>
+		<result  column="DEPT_NAME" property="deptName" jdbcType="VARCHAR"/>
+		<result  column="NAME" property="patientName" jdbcType="VARCHAR"/>
+		<result  column="PATIENT_ID" property="hospitalNumber" jdbcType="VARCHAR"/>
+		<result  column="FIRST_OPERATION_NURSE" property="washHandNurse" jdbcType="VARCHAR"/>
+		<result  column="FIRST_SUPPLY_NURSE" property="circuitNurse" jdbcType="VARCHAR"/>
+		<result  column="CONSOLE_NAME" property="consoleName" jdbcType="VARCHAR"/>
+		<result  column="needTranscoding" property="needTranscoding" jdbcType="VARCHAR"/>
+		<result  column="PATIENTAGE" property="patientAge" jdbcType="VARCHAR"/>
+	</resultMap>
+	
+<!-- 按手术时间查找手术预约单-->
+ <select id="findSyncOperationReservationByTimes" resultMap="queryForListMap">
+  	<![CDATA[
+	SELECT  po.*
+	FROM OperationPatientInfo po 
+	WHERE 1=1
+	]]>
+	<if test="startDate != null">
+		and po.SCHEDULED_DATE_TIME >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and po.SCHEDULED_DATE_TIME <= #{endDate}
+		]]>
+	</if>
+	<![CDATA[
+	ORDER BY po.ID
+	]]>
+  </select>
+  
+	<!-- 按申请单单号集合查找申请单-->
+   <select id="findSyncOperationReservationBySerialNumbers" resultMap="queryForListMap">
+  	<![CDATA[
+	SELECT  po.*
+	FROM OperationPatientInfo po
+	WHERE 1=1
+	]]>
+	<if test="serialNumbers != null and serialNumbers.size>0"> 
+			and po.ID in
+		    <foreach collection="serialNumbers"  item="serialNumber" open="(" separator=", " close=")">
+	             #{serialNumber}       
+	       </foreach>     
+	 </if>
+	<![CDATA[
+	ORDER BY po.SCHEDULED_DATE_TIME
+	]]>
+   </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r35937 -r36233
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 35937)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 36233)
@@ -224,15 +224,15 @@
   //申请外来器械包时，是否需要用颜色区分材料的“清洗分类类型”（注意：这里是以包定义的为准，配置true则需要，配置成false或者没配置都不需要）
   washClassifyTypeUseColorDiscriminate : true,
   //禁用一次性物品入库单添加(防止因删除导致回写结果不准确)
-  disableGodownEntryAdd : true,
+  disableGodownEntryAdd:false,
   //禁用一次性物品入库单导入(防止因删除导致回写结果不准确)
   disableGodownEntryImport : true,
   //禁用一次性物品入库单删除(防止因删除导致回写结果不准确)
-  disableGodownEntryDelete : true,
+  disableGodownEntryDelete:false,
   //外来器械申请单是否允许申请多套外来器械包（配置为true则允许，配置成false或者没配都不允许）
   allowApplyMultipleForeignTousse : true,
   //禁用一次性物品退库单删除(防止因删除导致回写结果不准确)
-  disableGodownOutEntryDelete : true,
+  disableGodownOutEntryDelete:false,
   //申请外来器械包时，是否启用清洗分类类型快速清零的功能（配置为true标识启用，配置成false或者没配都不启用）
   washClassifyTypeFastClearing : true,
   // 发货计划模块隐藏未打印的一次性物品申请单，默认为false
@@ -241,8 +241,6 @@
   returnGoodsRecordForm_printZeroStockBatches: true,
   // 发货扫描后，重新排序申请物品
   invoicePlanExtractedForm_resortRecyclingApplicationItems : true,
-  //禁用供应室领用记录删除(防止因删除导致回写结果不准确)
-  disableReceiveRecordDelete : true,
   //启用库存对比功能菜单
   enableBatchStockCompare : true,
   //一次性物品盘点版本(版本2的盘点粒度细化到标识表这一级即最底导,原版本的盘点粒度只到批次这一级)
@@ -339,6 +337,8 @@
   signModeOfPDASignModule:3,
   //启用手术预约功能
   enableOperationReservation:true,
+  //启用手术预约同步按钮
+  enableSyncOperationReservation:true,
   //启用灭菌检测包功能
   enableScanSterilizationMonitoringPackage:false,
   //启用回收拍摄功能
@@ -349,6 +349,8 @@
   enablePrintLabelsOutputPrinterSettingsFunction:true,
   //手术仪器管理别名配置
   aliasNameOfSurgicalInstrumentsManagement:[{"fieldName":"invoiceOfOperation","displayText":"领出"}, {"fieldName":"invoiceTypeOfPDA","displayText":"领出"}],
+  //启用器械包批量修改
+  tousseDefinitionCanBatchEdit:true,
   //发货计划背景颜色设定
   backgroudColorConfigOfInvoiceGoodsList : {
 	unsterilizedColor : { "className" : "my_row_white" , "color" : "#ffffff"},//未灭菌的颜色
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/spring/HIS.xml
===================================================================
diff -u -r27961 -r36233
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/spring/HIS.xml	(.../HIS.xml)	(revision 27961)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/spring/HIS.xml	(.../HIS.xml)	(revision 36233)
@@ -59,30 +59,32 @@
         </property>  
     </bean>
     
-    <bean id="inventoryManagerTarget"
+    <!--bean id="inventoryManagerTarget"
 		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
-	</bean>
+	</bean-->
     
-    <bean id="inventoryManager"
+    <!--bean id="inventoryManager"
 		 parent="txProxyTemplate">
 		<property name="target">
 			<ref bean="inventoryManagerTarget" />
 		</property>
-	</bean>
+	</bean-->
     
     <!-- 访问物资数据dao -->
-    <bean id="inventoryDao" class="com.forgon.disinfectsystem.inventorymanagement.gdsy.dao.InventoryDaoImpl">
-    </bean>
+    <!--bean id="inventoryDao" class="com.forgon.disinfectsystem.inventorymanagement.gdsy.dao.InventoryDaoImpl">
+    </bean-->
     
     <!-- 回写dao -->
-    <bean id="writeBackInventoryDao" class="com.forgon.disinfectsystem.inventorymanagement.gdsy.dao.WriteBackInventoryDaoImpl">
+    <!--bean id="writeBackInventoryDao" class="com.forgon.disinfectsystem.inventorymanagement.gdsy.dao.WriteBackInventoryDaoImpl">
     	<property name="config">
             <bean class="com.forgon.tools.json.JsonObjectFromResourceFactoryBean">
                 <property name="resource" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gdsy/interfaces/writeBackInventoryConfig.json" />
                 <property name="charset" value="UTF-8" />
             </bean>
         </property>
-    </bean>
+    </bean-->
+
+
     
     <!-- 引入mq-config.properties中的值 -->
     <util:properties id="setting" location="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gdsy/spring/mq-config.properties"></util:properties>
@@ -99,5 +101,39 @@
 		<property name="useRecordQueueManagerName" value="#{setting.useRecordQueueManagerName}"></property>
 		<property name="CCSID" value="#{setting.CCSID}"></property>
 	</bean>
+
+	    <!-- 定义手术预约申请单数据源。根据开发和生产环境需要，设置所用数据源的Bean id 为 operationReservationDataSource -->
+    <!-- 本地测试手术预约申请单数据 -->
+    <!-- <bean id="operationReservationDataSource"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">  
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//localhost:1521/ORCL" />  
+   		<property name="user" value="c##apps" />
+    	<property name="password" value="p2ssword" />
+    </bean> --> 
     
+    <!-- 手术预约申请单数据源 -->
+    <bean id="operationReservationDataSource"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">  
+        <property name="driverClass" value="com.mysql.jdbc.Driver" />  
+        <property name="jdbcUrl" value="jdbc:mysql://192.168.29.184:3306/lancet-aims" />  
+   		<property name="user" value="XKSJ" />
+    	<property name="password" value="Abc@123456" />
+    </bean>
+    
+    <!-- InvoicePlanDao接口的实现， 由MyBatis实现-->
+     <bean id="invoicePlanDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.inventorymanagement.dao.InvoicePlanDao" />  
+       <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="operationReservationDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gdsy/interfaces/mybatis/SyncOperationReservation_Mapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
+            </bean>
+       </property>
+    </bean>
+    
 </beans>
\ No newline at end of file