Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u -r28112 -r41502
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 28112)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 41502)
@@ -7,283 +7,112 @@
   <!-- 按单号查找入库单 -->
   <select id="findInEntryBySerialNumber" resultType="StorageEntry">
   	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark
-	FROM HRP_DBA."mate_mov_main"
-	WHERE "iow_no" = #{inEntrySerialNumber}
+	SELECT distinct CKDH as serialNumber,
+        	convert(datetime, CKRQ, 120) as time,
+	        null as remark
+	FROM V_CK_GYS
+	WHERE CKDH = #{inEntrySerialNumber}
 	]]>
   </select>
   
   <!-- 按时间查找入库单 -->
   <select id="findInEntryByTime" resultType="StorageEntry">
   	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark
-	FROM HRP_DBA."mate_mov_main"
-	WHERE "store_name" = '3'
-	and "exch_store_name" not in ('47','48','49','40','9')
+	SELECT distinct CKDH as serialNumber,
+        	convert(datetime, CKRQ, 120) as time,
+	        null as remark
+	FROM V_CK_GYS
+	WHERE 1=1
 	]]>
 	<if test="startDate != null">
-		and "make_date" >= #{startDate}
+		and convert(datetime, CKRQ, 120) >= #{startDate}
 	</if>
 	<if test="endDate != null">
 		<![CDATA[
-		and "make_date" - 0.99999 <= #{endDate}
+		and convert(datetime, CKRQ, 120) <= #{endDate}
 		]]>
 	</if>
-	ORDER BY "make_date"
+	<if test="currentOrgUnitCode != null">
+		<![CDATA[
+		and KSBM = (case when '011221309' = #{currentOrgUnitCode} then '01031501' when '010024127' = #{currentOrgUnitCode} then '01031502' else null end)
+		]]>
+	</if>
+	ORDER BY time
   </select>
   
-  <!-- 按时间范围、移入仓位、移出仓位查找入库单 -->
+    <!-- 按时间范围、移入仓位、移出仓位查找入库单 -->
   <select id="findInEntryByTimeAndTwoStoreCodeList" resultType="StorageEntry">
   	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark
-	FROM HRP_DBA."mate_mov_main"
-	WHERE 1=1 
+	SELECT distinct CKDH as serialNumber,
+        	convert(datetime, CKRQ, 120) as time,
+	        null as remark
+	FROM V_CK_GYS
+	WHERE 1=1
 	]]>
 	<if test="startDate != null">
-		and "make_date" >= #{startDate}
+		and convert(datetime, CKRQ, 120) >= #{startDate}
 	</if>
 	<if test="endDate != null">
 		<![CDATA[
-		and "make_date" - 0.99999 <= #{endDate}
+		and convert(datetime, CKRQ, 120) <= #{endDate}
 		]]>
 	</if>
-	<if test="storeCodeList != null and storeCodeList.size > 0"> 
-			and "store_name" in
-		    <foreach collection="storeCodeList"  item="storeCode" open="(" separator="," close=")">
-	             #{storeCode}       
-	       </foreach>     
-	 </if>
-	 <if test="exchStoreCodeList != null and exchStoreCodeList.size > 0"> 
-			and "exch_store_name" in
-		    <foreach collection="exchStoreCodeList"  item="exchStoreCode" open="(" separator="," close=")">
-	             #{exchStoreCode}       
-	       </foreach>     
-	 </if>
-	ORDER BY "make_date"
+	<if test="currentOrgUnitCode != null">
+		<![CDATA[
+		and KSBM = (case when '011221309' = #{currentOrgUnitCode} then '01031501' when '010024127' = #{currentOrgUnitCode} then '01031502' else null end)
+		]]>
+	</if>
+	ORDER BY time
   </select>
   
   <!-- 按单号查找入库单明细 -->
   <!-- 中六的HERP不包含供应商信息 -->
   <select id="findInEntryItem" resultType="StorageEntryItem">
   	<![CDATA[
-	SELECT  "inv_code" AS inventorySerialNumber,
+	SELECT  WZBM AS inventorySerialNumber,
 			null AS supplierName,
-	        "batch_no" AS batchNumber,
-	        "inva_date" AS expDate,
-	        "amount" AS amount,
-	        "price" AS unitPrice
-	FROM HRP_DBA."mate_mov_detail"
-	WHERE "iow_no" = #{inEntrySerialNumber}
+	        batch AS batchNumber,
+	        invalid_date AS expDate,
+	        quantity AS amount,
+	        price AS unitPrice
+	FROM V_CK_GYS
+	WHERE CKDH = #{inEntrySerialNumber}
 	]]>
   </select>
   
   <!-- 按物资编码查找物资信息 -->
   <select id="getInventory" resultType="Inventory">
   	<![CDATA[
-	SELECT serialNumber,
-	       name,
-	       specification,
-	       category,
-	       categoryCode,
-	       unit,
-	       cost
-	FROM InventoryTemporaryData
-	WHERE serialNumber = #{inventorySerialNumber}
+	SELECT distinct WZBM AS serialNumber,
+	       WZMC AS name,
+	       WZGG AS specification,
+	       WZLB AS category,
+	       null AS categoryCode,
+	       JLDW AS unit,
+	       price AS cost
+	FROM V_CK_GYS
+	WHERE WZBM = #{inventorySerialNumber}
 	]]>
   </select>
   
    <!-- 按名称规格查找物资信息,可能已经不再使用:标注日期2018-07-04 shuyongfu -->
   <select id="findInventory" resultType="Inventory">
-	SELECT inv_code AS serialNumber,
-	       inv_name AS name,
-	       inv_model AS specification,
-	       mate_type_name AS category,
-	       unit_name AS unit,
+	SELECT distinct WZBM AS serialNumber,
+	       WZMC AS name,
+	       WZGG AS specification,
+	       WZLB AS category,
+	       JLDW AS unit,
 	       price AS cost
-	FROM zsyk_dict_inv_v
-	WHERE inv_name = #{name}
+	FROM V_CK_GYS
+	WHERE WZMC = #{name}
 	<choose>
 		<when test="specification != null">
-			AND inv_model = #{specification}
+			AND WZGG = #{specification}
 		</when >
 		<otherwise>
-			AND ((inv_model is null) OR (inv_model =''))
+			AND ((WZGG is null) OR (WZGG =''))
 		</otherwise>
 	</choose>
   </select>
-  
-  <!-- 按单号查找退库单 -->
-  <!-- 中山眼科中心无需从物资系统同步退库单 -->
-  <select id="findOutEntryBySerialNumber" resultType="StorageEntry">
-  	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark
-	FROM HRP_DBA."mate_mov_main"
-	WHERE "iow_no" = #{inEntrySerialNumber}
-	]]>
-  </select>
-  
-  <!-- 按时间查找退库单 -->
-  <select id="findOutEntryByTime" resultType="StorageEntry">
-  	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark
-	FROM HRP_DBA."mate_mov_main"
-	WHERE "exch_store_name" = '3'
-	and "store_name" not in ('47','48','49','40','9')
-	]]>
-	<if test="startDate != null">
-		and "make_date" >= #{startDate}
-	</if>
-	<if test="endDate != null">
-		<![CDATA[
-		and "make_date" - 0.99999 <= #{endDate}
-		]]>
-	</if>
-	ORDER BY "make_date"
-  </select>
-  
-  <!-- 按时间、移入仓位、移出仓位查找退库单 -->
-  <select id="findOutEntryByTimeAndTwoStoreCodeList" resultType="StorageEntry">
-  	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark
-	FROM HRP_DBA."mate_mov_main"
-	WHERE 1=1 
-	]]>
-	<if test="startDate != null">
-		and "make_date" >= #{startDate}
-	</if>
-	<if test="endDate != null">
-		<![CDATA[
-		and "make_date" - 0.99999 <= #{endDate}
-		]]>
-	</if>
-	<if test="storeCodeList != null and storeCodeList.size > 0"> 
-			and "store_name" in
-		    <foreach collection="storeCodeList"  item="storeCode" open="(" separator=", " close=")">
-	             #{storeCode,jdbcType=VARCHAR}       
-	       </foreach>     
-	 </if>
-	 <if test="exchStoreCodeList != null and exchStoreCodeList.size > 0"> 
-			and "exch_store_name" in
-		    <foreach collection="exchStoreCodeList"  item="exchStoreCode" open="(" separator=", " close=")">
-	             #{exchStoreCode,jdbcType=VARCHAR}       
-	       </foreach>     
-	 </if>
-	ORDER BY "make_date"
-  </select>
-  
-  <!-- 按单号查找退库单明细 -->
-  <select id="findOutEntryItem" resultType="StorageEntryItem">
-  	<![CDATA[
-	SELECT  "inv_code" AS inventorySerialNumber,
-			null AS supplierName,
-	        "batch_no" AS batchNumber,
-	        "inva_date" AS expDate,
-	        "amount" AS amount,
-	        "price" AS unitPrice,
-	        "inv_code" AS invCode
-	FROM HRP_DBA."mate_mov_detail"
-	WHERE "iow_no" = #{entrySerialNumber}
-	]]>
-  </select>
-  
-  <!-- 按时间查找退货单(手术室(或麻醉科)退至供应室) -->
-  <select id="findReturnEntryByTime" resultType="StorageEntry">
-  	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark,
-	        "store_name" as storeName
-	FROM HRP_DBA."mate_mov_main"
-	WHERE "store_name" = '3'
-	and "exch_store_name" in ('47','48','49','40','9')
-	]]>
-	<if test="startDate != null">
-		and "make_date" >= #{startDate}
-	</if>
-	<if test="endDate != null">
-		<![CDATA[
-		and "make_date" - 0.99999 <= #{endDate}
-		]]>
-	</if>
-	ORDER BY "make_date"
-  </select>
-  
-  <!-- 按时间、移入仓位、移出仓位查找退货单(手术室(或麻醉科)退至供应室) -->
-  <select id="findReturnEntryByTimeAndTwoStoreCodeList" resultType="StorageEntry">
-  	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark,
-	        "store_name" as storeName
-	FROM HRP_DBA."mate_mov_main"
-	WHERE 1=1 
-	]]>
-	<if test="startDate != null">
-		and "make_date" >= #{startDate}
-	</if>
-	<if test="endDate != null">
-		<![CDATA[
-		and "make_date" - 0.99999 <= #{endDate}
-		]]>
-	</if>
-	<if test="storeCodeList != null and storeCodeList.size > 0"> 
-			and "store_name" in
-		    <foreach collection="storeCodeList"  item="storeCode" open="(" separator=", " close=")">
-	             #{storeCode,jdbcType=VARCHAR}       
-	       </foreach>     
-	 </if>
-	 <if test="exchStoreCodeList != null and exchStoreCodeList.size > 0"> 
-			and "exch_store_name" in
-		    <foreach collection="exchStoreCodeList"  item="exchStoreCode" open="(" separator=", " close=")">
-	             #{exchStoreCode,jdbcType=VARCHAR}       
-	       </foreach>     
-	 </if>
-	ORDER BY "make_date"
-  </select>
-  
-  <select id="findReturnEntryBySerialNumber" resultType="StorageEntry">
-  	<![CDATA[
-	SELECT "iow_no" as serialNumber,
-        	"make_date" as time,
-	        "maker" as remark,
-	        "store_name" as storeName
-	FROM HRP_DBA."mate_mov_main"
-	WHERE "iow_no" = #{inEntrySerialNumber}
-	]]>
-  </select>
-  
-  <!-- 按单号查找退货单明细(手术室退至供应室) -->
-  <select id="findReturnEntryItem" resultType="StorageEntryItem">
-  	<![CDATA[
-	SELECT  "inv_code" AS inventorySerialNumber,
-			null AS supplierName,
-	        "batch_no" AS batchNumber,
-	        "inva_date" AS expDate,
-	        "amount" AS amount,
-	        "price" AS unitPrice,
-	        "inv_code" AS invCode
-	FROM HRP_DBA."mate_mov_detail"
-	WHERE "iow_no" = #{entrySerialNumber}
-	]]>
-  </select>
 
-  <!-- 更新单的状态与处理错误信息 -->
-  <update id="updateEntryStateAndErrorMessage">
-  <![CDATA[
-  update HRP_DBA."mate_mov_main" set "record_state"=#{recordState,jdbcType=VARCHAR},"error_message"=#{errorMessage,jdbcType=VARCHAR} where "iow_no"=#{entrySerialNumber,jdbcType=VARCHAR}
-  ]]>
-  </update>
-
 </mapper>
\ No newline at end of file
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
===================================================================
diff -u -r40302 -r41502
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java	(.../InventoryManagerImpl.java)	(revision 40302)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java	(.../InventoryManagerImpl.java)	(revision 41502)
@@ -262,10 +262,13 @@
 		case GodownEntry.TYPE_IN:
 			//如果有配置仓位信息,则查出对应的供应室与设备科的编码
 			if(exitStoreCodeConfig){
-				result = Arrays.asList(inventoryDao.findInEntryByTimeAndTwoStoreCodeList(startDate, endDate, supplyRoomStoreCodeListOfCurrentOrgUnit, deviceSectionStoreCodeList));
+				result = Arrays.asList(inventoryDao.findInEntryByTimeAndTwoStoreCodeList(startDate, endDate, supplyRoomStoreCodeListOfCurrentOrgUnit, deviceSectionStoreCodeList, currentOrgUnitCode));
 			}else{
 				if(ConfigUtils.isProject("nfykdxnfyy")){
 					result = Arrays.asList(inventoryDao.findInEntryByTime(startDate, endDate, outStorLoc));
+				}if(ConfigUtils.isProject("zsykzx")){
+					//当前登录科室，只同步当前科室关联的入库单ZSYKEQ-37
+					result = Arrays.asList(inventoryDao.findInEntryByTime(startDate, endDate, null, currentOrgUnitCode));
 				}else{
 					result = Arrays.asList(inventoryDao.findInEntryByTime(startDate, endDate));
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml
===================================================================
diff -u -r30075 -r41502
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml	(.../HERP.xml)	(revision 30075)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml	(.../HERP.xml)	(revision 41502)
@@ -96,13 +96,31 @@
         <property name="password" value="zsykzx" /> -->
     </bean>
     
+    <!-- 根据开发和生产环境需要，设置所用数据源的Bean id 为 inventoryDataSource2,改由广州易朋提供,(since 2025-11-25) -->
+    <bean id="inventoryDataSource2"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+        destroy-method="close">
+        
+        <!-- 正式环境(广州易朋) -->
+        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
+        <property name="jdbcUrl" value="jdbc:sqlserver://192.168.170.250;databaseName=HRP" />
+        <property name="user" value="GYS" />
+        <property name="password" value="Gys@123" />
+        
+        <!-- 测试环境(广州易朋) -->
+        <!-- <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
+        <property name="jdbcUrl" value="jdbc:sqlserver://127.0.0.1;databaseName=HRP" />
+        <property name="user" value="sa" />
+        <property name="password" value="p2ssword" /> -->
+    </bean>
+    
     <!-- inventoryDao不再基于mybatis,改为基于ibm mq的实现.since 2017-11-20-->
     <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="dataSource" ref="inventoryDataSource2" />
                 <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/zsykzx/interfaces/mybatis/syncFromHERP_Mapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
             </bean>
@@ -126,7 +144,7 @@
     </bean>
     
     <!-- inventoryBaseDataDao接口的实现， 由MyBatis实现,查询基础数据时优先取此数据源,未配置时取上面的数据-->
-    <bean id="inventoryBaseDataDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+	<!-- <bean id="inventoryBaseDataDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
            value="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao" />  
        <property name="sqlSessionFactory">
@@ -136,7 +154,7 @@
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
             </bean>
        </property>
-    </bean>
+    </bean> -->
     
  	<!-- WriteBackInventoryDao 接口的实现， 由MyBatis实现-->
     <bean id="writeBackInventoryDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InventoryDao.java
===================================================================
diff -u -r40302 -r41502
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InventoryDao.java	(.../InventoryDao.java)	(revision 40302)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InventoryDao.java	(.../InventoryDao.java)	(revision 41502)
@@ -35,6 +35,19 @@
 	}
 	
 	/**
+	 * 根据时间、“来源仓库”、科室编码查询入库单
+	 * @param startDate		开始时间
+	 * @param endDate		结束时间
+	 * @param outStorLoc	来源仓库, 此字段用于查询时筛选相关来源仓库的入库单NFYY-117
+	 * @param currentOrgUnitCode 当前登录科室编码
+	 * @return
+	 */
+	public default StorageEntry[] findInEntryByTime(@Param("startDate") Date startDate, @Param("endDate") Date endDate, String outStorLoc,
+			@Param("currentOrgUnitCode") String currentOrgUnitCode){
+		return null;
+	}
+	
+	/**
 	 * 根据单号和时间查询入库单
 	 * @param entrySerialNumber	单号
 	 * @param startDate			开始时间
@@ -103,6 +116,30 @@
 	);
 
 	/**
+	 * 根据移入与移出仓位码、科室编码查询入库单信息
+	 * @param startDate
+	 * @param endDate
+	 * @param storeCodeList
+	 * @param exchStoreCodeList
+	 * @param currentOrgUnitCode 当前登录科室编码
+	 * @return
+	 */
+	default StorageEntry[] findInEntryByTimeAndTwoStoreCodeList( 
+			@Param("startDate")
+			Date startDate,
+			@Param("endDate")
+			Date endDate,
+			@Param("storeCodeList")
+			List<String> storeCodeList,
+			@Param("exchStoreCodeList")
+			List<String> exchStoreCodeList,
+			@Param("currentOrgUnitCode")
+			String currentOrgUnitCode
+	){
+		return null;
+	}
+
+	/**
 	 * /**
 	 * 根据移入与移出仓位码查询退库单信息
 	 * @param startDate