Index: ssts-web/src/main/resources/spring/projects/ggsrmyy/HIS.xml
===================================================================
diff -u -r22588 -r22897
--- ssts-web/src/main/resources/spring/projects/ggsrmyy/HIS.xml	(.../HIS.xml)	(revision 22588)
+++ ssts-web/src/main/resources/spring/projects/ggsrmyy/HIS.xml	(.../HIS.xml)	(revision 22897)
@@ -52,10 +52,10 @@
     <bean id="hisDataSource"
         class="com.mchange.v2.c3p0.ComboPooledDataSource"
         destroy-method="close">  
-        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
-        <property name="jdbcUrl" value="jdbc:oracle:thin:@//10.18.16.20:1521/ggsrmyy" />  
-        <property name="user" value="hisjk" />  
-        <property name="password" value="hisjk" />  
+        <property name="driverClass" value="com.ibm.db2.jcc.DB2Driver" />  
+        <property name="jdbcUrl" value="jdbc:db2://172.16.100.21:50100/hisdb" />  
+        <property name="user" value="KJYWUSER" />  
+        <property name="password" value="Kjyw20160525" />  
     </bean>
     
 
@@ -101,6 +101,43 @@
        </property>
     </bean>
 
+       <!-- 同步物资入库单数据 --> 
+    <bean id="inventoryDataSource"
+		class="com.mchange.v2.c3p0.ComboPooledDataSource"
+		destroy-method="close"> 
+	<property name="driverClass" value="com.ibm.db2.jcc.DB2Driver" /> 
+		<property name="jdbcUrl" value="jdbc:db2://172.16.100.21:50100/hisdb" /> 
+		<property name="user" value="KJYWUSER" /> 
+		<property name="password" value="Kjyw20160525" /> 
+	</bean>
+	
+     <bean id="inventoryManagerTarget"
+		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
+	</bean>
     
-    
+    <bean id="inventoryManager"
+		class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager" ref="transactionManager" />
+		<property name="target">
+			<ref bean="inventoryManagerTarget" />
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+ 	<bean id="inventoryDao" class="org.mybatis.spring.mapper.MapperFactoryBean"> 
+		<property name="mapperInterface" 
+			value="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao" /> 
+		<property name="sqlSessionFactory">
+			<bean class="org.mybatis.spring.SqlSessionFactoryBean">
+				<property name="dataSource" ref="inventoryDataSource" />
+				<property name="mapperLocations" value="classpath:config/ggsrmyy/mybatis/SyncFromHERP_Mapper.xml" />
+				<property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
+			</bean>
+		</property>
+	</bean> 
+	
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/ggsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r22588 -r22897
--- ssts-web/src/main/resources/config/ggsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 22588)
+++ ssts-web/src/main/resources/config/ggsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 22897)
@@ -8,14 +8,14 @@
  <!-- 按住院号查找病人信息 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
         <![CDATA[    
-		 select * from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
+		 select * from CSSD_HospitalNumber_Plan where hospitalNumber = #{hospitalNum}
 		]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
     <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	 select * from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
+	 select * from CSSD_HospitalNumber_Plan where hospitalNumber = #{hospitalNum}
 	]]>
   </select>
  
Index: ssts-web/src/main/resources/config/ggsrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r22588 -r22897
--- ssts-web/src/main/resources/config/ggsrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 22588)
+++ ssts-web/src/main/resources/config/ggsrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 22897)
@@ -8,7 +8,7 @@
   
 <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	select * from cssd_clinicnumber where clinicNumber = #{treatmentNum}
+	select * from CSSD_ClinicNumber where clinicNumber = #{treatmentNum}
 	]]>
   </select>
 
Index: ssts-web/src/main/resources/config/ggsrmyy/mybatis/SyncFromHERP_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/ggsrmyy/mybatis/SyncFromHERP_Mapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/ggsrmyy/mybatis/SyncFromHERP_Mapper.xml	(revision 22897)
@@ -0,0 +1,110 @@
+<?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,
+	        amount,
+	        expDate,
+	        cost AS unitPrice
+	FROM  CSSD_MaterialEntry t1
+	INNER JOIN CSSD_MaterialEntryItem t2 on t1.serialNumber = t2.serialNumber
+	WHERE t1.SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+<!-- 按物资编码查找物资信息 -->
+<select id="getInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT InventorySerialNumber AS serialNumber,
+	    name,specification,unit
+		FROM CSSD_MaterialDefinition
+		WHERE InventorySerialNumber = #{inventorySerialNumber}
+	]]>
+</select> 
+<!-- 按名称规格查找物资信息 -->
+<select id="findInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT InventorySerialNumber 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>
+	]]>
+</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,
+	        amount,
+	        EXPDATE,
+	        cost AS unitPrice
+	FROM  CSSD_GodownEntry t1
+	INNER JOIN cssd_godownentryitem t2 on t1.serialNumber = t2.serialNumber
+	WHERE t1.serialNumber = #{entrySerialNumber}
+	]]>
+</select> 
+</mapper> 
\ No newline at end of file
Index: ssts-web/src/main/resources/config/ggsrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r22588 -r22897
--- ssts-web/src/main/resources/config/ggsrmyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 22588)
+++ ssts-web/src/main/resources/config/ggsrmyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 22897)
@@ -7,16 +7,16 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT  name, coding,parentcoding from CSSD_Department where coding<>0 order by  parentcoding , coding
+	SELECT name,coding from CSSD_Department where coding<>0 order by coding
 
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	select * from cssd_user where Coding != ''
-	ORDER BY orgunitcoding
+	select name,coding,orgUnitCoding from CSSD_User where coding is not null
+	ORDER BY orgUnitCoding
 	]]>
   </select>
 </mapper>
\ No newline at end of file