Index: ssts-web/src/main/resources/spring/projects/zsykzx/HERP.xml
===================================================================
diff -u -r12335 -r12554
--- ssts-web/src/main/resources/spring/projects/zsykzx/HERP.xml	(.../HERP.xml)	(revision 12335)
+++ ssts-web/src/main/resources/spring/projects/zsykzx/HERP.xml	(.../HERP.xml)	(revision 12554)
@@ -133,6 +133,39 @@
 		</property>
 	</bean>
 	
+	<!-- 定义项目manager的bean start -->
+	<bean id="projectManagerTarget"
+		class="com.forgon.disinfectsystem.project.service.ProjectManagerImpl">
+	</bean>
+	
+	<bean id="projectManager"
+		class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager" ref="inventoryTransactionManager" />
+		<property name="target">
+			<ref local="projectManagerTarget" />
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	<!-- 定义项目manager的bean end -->
+	
+	<!-- 项目projectDao 接口的实现， 由MyBatis实现 start-->
+    <bean id="projectDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.project.dao.ProjectDao" />  
+       <property name="sqlSessionFactory" > 
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="inventoryDataSource" />
+                <property name="mapperLocations" value="classpath*:config/zsykzx/mybatis/queryProject_Mapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.project.model" />
+            </bean>
+        </property>
+    </bean>
+    <!-- 项目projectDao 接口的实现， 由MyBatis实现 end-->
+	
 	<bean id="writeBackInventoryHelper"
 		class="com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryHelper">
 	</bean>
Index: ssts-web/src/main/resources/config/zsykzx/mybatis/syncToHERP_Mapper.xml
===================================================================
diff -u -r12331 -r12554
--- ssts-web/src/main/resources/config/zsykzx/mybatis/syncToHERP_Mapper.xml	(.../syncToHERP_Mapper.xml)	(revision 12331)
+++ ssts-web/src/main/resources/config/zsykzx/mybatis/syncToHERP_Mapper.xml	(.../syncToHERP_Mapper.xml)	(revision 12554)
@@ -5,7 +5,7 @@
 <mapper namespace="com.forgon.disinfectsystem.inventorymanagement.dao.WriteBackInventoryDao">
 
   <sql id="writeBackEntryFields">
-   (year_month,iow_no,dept_code,make_date,maker,store_code,bus_type_code,comp_code,copy_code) 
+   (year_month,iow_no,dept_code,make_date,maker,store_code,bus_type_code,comp_code,copy_code,proj_code) 
   </sql>
   
   <insert id="insertWriteBackEntryForInvoice" useGeneratedKeys="true" keyProperty="id">
@@ -19,9 +19,10 @@
 		, #{time}
 		, #{operator}
 		, '03'
-		, '2'
+		, #{type}
 		, '1001'
 		, '101'
+		,#{projCode}
 	)
   </insert>
   
@@ -39,6 +40,7 @@
 		, '22'
 		, '1001'
 		, '101'
+		,null
 	)
   </insert>
   
@@ -56,6 +58,7 @@
 		, '14'
 		, '1001'
 		, '101'
+		, null
 	)
   </insert>
   
@@ -74,6 +77,7 @@
 		, '2'
 		, '1001'
 		, '101'
+		, null
 	)
   </insert>
   
Index: ssts-web/src/main/resources/config/zsykzx/mybatis/queryProject_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/zsykzx/mybatis/queryProject_Mapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/zsykzx/mybatis/queryProject_Mapper.xml	(revision 12554)
@@ -0,0 +1,29 @@
+<?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.project.dao.ProjectDao">
+  
+  <!-- 查出所有的项目 -->
+  <select id="getAllProject" resultType="ProjectDict">
+  	<![CDATA[
+		SELECT 项目编码 as projCode,项目名称 as projName FROM view_proj_dict
+	]]>
+	<if test="projectName != ''">
+		where 项目名称 like '%'+#{projectName}+'%'
+	</if>
+	<![CDATA[
+		order by projName
+	]]>
+  </select>
+  
+  <!-- 根据项目编号查出项目余额数据 -->
+  <select id="getProjectBalanceListByProjCode" resultType="ProjectBalance">
+  	<![CDATA[
+		SELECT 项目编码 as projCode,项目名称 as projName,
+		材料分类编码   as inventorySerialNumber,总余额 as totalBalance,材料支出余额 as inventoryPayoutBalance
+		FROM view_proj_balance
+		WHERE 项目编码=#{projCode}
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/zsykzx/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u -r12331 -r12554
--- ssts-web/src/main/resources/config/zsykzx/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 12331)
+++ ssts-web/src/main/resources/config/zsykzx/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 12554)
@@ -22,7 +22,8 @@
         	make_date as time,
 	        maker as remark
 	FROM v_mate_mov_main
-	WHERE (bus_type_code = '1')
+	WHERE store_name like '供应室%'
+	and exch_store_name not like '手术室%' and exch_store_name not like '麻醉科%'
 	]]>
 	<if test="startDate != null">
 		and make_date >= CONVERT(datetime,#{startDate})
@@ -105,7 +106,8 @@
         	make_date as time,
 	        maker as remark
 	FROM v_mate_mov_main
-	WHERE (bus_type_code = '2')
+	WHERE exch_store_name like '供应室%'
+	and store_name not like '手术室%' and store_name not like '麻醉科%'
 	]]>
 	<if test="startDate != null">
 		and make_date >= CONVERT(datetime,#{startDate})
@@ -135,14 +137,16 @@
 	]]>
   </select>
   
-  <!-- 按时间查找退货单(手术室退至供应室) -->
+  <!-- 按时间查找退货单(手术室(或麻醉科)退至供应室) -->
   <select id="findReturnEntryByTime" resultType="StorageEntry">
   	<![CDATA[
 	SELECT iow_no as serialNumber,
         	make_date as time,
-	        maker as remark
+	        maker as remark,
+	        store_name as storeName
 	FROM v_mate_mov_main
-	WHERE (bus_type_code = '3')
+	WHERE store_name like '供应室%'
+	and (exch_store_name like '手术室%' or exch_store_name like '麻醉科%')
 	]]>
 	<if test="startDate != null">
 		and make_date >= CONVERT(datetime,#{startDate})
@@ -159,7 +163,8 @@
   	<![CDATA[
 	SELECT iow_no as serialNumber,
         	make_date as time,
-	        maker as remark
+	        maker as remark,
+	        store_name as storeName
 	FROM v_mate_mov_main
 	WHERE iow_no = #{inEntrySerialNumber}
 	]]>
Index: ssts-web/src/main/resources/spring/projects/sznsfy/HIS.xml
===================================================================
diff -u -r12335 -r12554
--- ssts-web/src/main/resources/spring/projects/sznsfy/HIS.xml	(.../HIS.xml)	(revision 12335)
+++ ssts-web/src/main/resources/spring/projects/sznsfy/HIS.xml	(.../HIS.xml)	(revision 12554)
@@ -48,6 +48,20 @@
 		destroy-method="close">
         <property name="driverClass" value="sun.jdbc.odbc.JdbcOdbcDriver" />  
         <property name="jdbcUrl" value="jdbc:odbc:cache" />
+        
+        <!-- 增加连接池及连接后中断后自动重连的配置 -->
+        <property name="minPoolSize">
+			<value>5</value>
+		</property>
+		<property name="maxPoolSize" value="30" />
+		<property name="initialPoolSize" value="10" />
+		<property name="maxIdleTime" value="60" />
+		<property name="acquireIncrement" value="5" />
+		<property name="maxStatements" value="0" />
+		<property name="idleConnectionTestPeriod" value="60" />
+		<property name="acquireRetryAttempts" value="30" />
+		<property name="breakAfterAcquireFailure" value="false" />
+		<property name="testConnectionOnCheckout" value="false" />
     </bean>
     
     
@@ -78,7 +92,7 @@
     </bean>
     
     
-    <!-- 住院号 -->
+    <!-- 住院号,hisDataSource2数据源暂时不再使用 -->
     <bean id="hisDataSource2"
         class="com.mchange.v2.c3p0.ComboPooledDataSource"
 		destroy-method="close">
@@ -93,7 +107,7 @@
            value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource2" />
+                <property name="dataSource" ref="hisDataSource" />
                 <property name="mapperLocations" value="classpath*:config/sznsfy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>