Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js
===================================================================
diff -u -r37508 -r40858
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js	(.../printConfig.js)	(revision 37508)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js	(.../printConfig.js)	(revision 40858)
@@ -867,7 +867,7 @@
 	    	          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
 	    	]
 	    },
-	    {codeType : "128Auto", dataIndex : 'barcode', position : ["91mm","5mm","40mm","8mm"], 
+	    {codeType : "128Auto", dataIndex : 'barcode', position : ["91mm","10mm","40mm","8mm"], 
 	    	styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
 	    	          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
 	    	          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u -r40302 -r40858
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 40858)
@@ -7,23 +7,23 @@
  <select id="findInEntryBySerialNumber" resultType="StorageEntry">
   	<![CDATA[
 	SELECT serialNumber,time,remark 
-	FROM CSSD_MATERIALENTRY
+	FROM xi_sf.CSSD_MATERIALENTRY
 	WHERE SERIALNUMBER  = #{inEntrySerialNumber}
 	]]>
  </select>
 <!-- 按时间查找入库单 -->
  <select id="findInEntryByTime" resultType="StorageEntry">
   	<![CDATA[
 	SELECT serialNumber,time,remark
-	FROM CSSD_MATERIALENTRY
+	FROM xi_sf.CSSD_MATERIALENTRY
 	where 1=1
 	]]> 
 	<if test="startDate != null">
-		and time >= #{startDate}
+		and  to_date(time, 'yyyy-MM-dd') >= #{startDate}
 	</if>
 	<if test="endDate != null">
 		<![CDATA[
-		and time <= #{endDate}
+		and to_date(time, 'yyyy-MM-dd') <= #{endDate}
 		]]>
 	</if>
 	ORDER BY time	 
@@ -41,24 +41,27 @@
 	specification,
 	cost unitPrice,
 	XFREE5 sterialBatchNumber
-	FROM CSSD_MaterialEntryItem
+	FROM  xi_sf.CSSD_MaterialEntryItem
 	WHERE SERIALNUMBER = #{inEntrySerialNumber}
 	]]>
 </select> 
 
 <!-- 按物资编码查找物资信息 -->
 <select id="getInventory" resultType="Inventory">
 	<![CDATA[
-		SELECT serialNumber,name,specification,unit, SFSF AS whetherToCharge
-		FROM CSSD_MATERIALDEFINITION
+		SELECT serialNumber,name,specification,unit,
+		case when SFSF = '未维护字段' then '否' else SFSF end AS whetherToCharge
+		FROM xi_sf.CSSD_MATERIALDEFINITION
 		WHERE serialNumber = #{inventorySerialNumber}
+		and rownum = 1
 	]]>
 </select> 
 <!-- 按名称规格查找物资信息 -->
 <select id="findInventory" resultType="Inventory">
 	<![CDATA[
-		SELECT serialNumber,name,specification,unit, SFSF AS whetherToCharge
-	FROM CSSD_MATERIALDEFINITION
+		SELECT serialNumber,name,specification,unit,
+		case when SFSF = '未维护字段' then '否' else SFSF end AS whetherToCharge
+	FROM  xi_sf.CSSD_MATERIALDEFINITION
 	WHERE name = #{name}
 	]]>
 	<choose>
@@ -74,7 +77,7 @@
 <select id="findOutEntryBySerialNumber" resultType="StorageEntry">
 	<![CDATA[
 	SELECT serialNumber,time,remark
-	FROM CSSD_GodownEntry
+	FROM  xi_sf.CSSD_GodownEntry
 	WHERE serialNumber = #{inEntrySerialNumber}
 	]]>
 </select>
@@ -83,15 +86,15 @@
 <select id="findOutEntryByTime" resultType="StorageEntry">
   	<![CDATA[
 	SELECT serialNumber,time,remark
-	FROM CSSD_GodownEntry
+	FROM xi_sf.CSSD_GodownEntry
 	WHERE 1=1
 	]]> 
 	<if test="startDate != null">
-		and time >= #{startDate}
+		and  to_date(time, 'yyyy-MM-dd') >= #{startDate}
 	</if>
 	<if test="endDate != null">
 		<![CDATA[
-		and time <= #{endDate}
+		and to_date(time, 'yyyy-MM-dd') <= #{endDate}
 		]]>
 	</if>
 	ORDER BY time
@@ -108,7 +111,8 @@
 	cost unitPrice,
 	specification,
 	XFREE5 sterialBatchNumber
-	FROM CSSD_GodownEntryItem t1
+	FROM xi_sf.CSSD_GodownEntryItem t1
+    inner join xi_sf.CSSD_GodownEntry t2 on t2.id = t1.godownEntryId
 	WHERE SERIALNUMBER = #{inEntrySerialNumber}
 	]]>
 </select> 
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/spring/HERP.xml
===================================================================
diff -u -r40302 -r40858
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/spring/HERP.xml	(.../HERP.xml)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/spring/HERP.xml	(.../HERP.xml)	(revision 40858)
@@ -29,10 +29,10 @@
     <bean id="inventoryDataSource"
         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.2.20:1433;databaseName=HISTEST" />
-        <property name="user" value="sa" />  
-        <property name="password" value="p2ssword" />
+    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+      <property name="jdbcUrl" value="jdbc:oracle:thin:@//172.16.30.170:1521/ORCL" />
+        <property name="user" value="XDGYZX" />  
+        <property name="password" value="XDGYZX123#" />
     </bean>
     
     <!-- InventoryDao接口的实现， 由MyBatis实现-->
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js
===================================================================
diff -u -r37540 -r40858
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js	(.../config.js)	(revision 37540)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js	(.../config.js)	(revision 40858)
@@ -17,7 +17,7 @@
   // 申请器械包时是否自动归还待归还物品
   autoReturnTousse : false,
   // 是否隐藏进入审核列表按钮
-  hideEnterReviewListButton : true,
+  hideEnterReviewListButton :false,
   // 是否自动补全用户名
   autoFillUserName:true,
   // 自动补全用户名的长度
@@ -73,7 +73,7 @@
  //启用使用记录申请单的扩展名
   enableUseRecordFormExtensionFields:["主刀医生核算科室"],
   //使用记录表单的必填项配置
- // notAllowBlankFieldsOnUseRecordPage : ["doctorAccountDepart"],
+  notAllowBlankFieldsOnUseRecordPage : ["doctorAccountDepart","doctorName"],
  //启用使用记录（主刀医生核算科室）报表
   enableUseRecordByChiefSurgeonDoctorsAccountingDepartment:true,
 //启用一次性物品定义的是否收费字段
@@ -99,13 +99,25 @@
 	  //是否禁用组织机构管理同步按钮
   hiddenOrgunitSyncButton:true,
   //入库单扩展字段
-  expandFieldsOfSyncGodownEntry:[
-      {"fieldName":"sterileBatchNumber","coloumnName":"灭菌批号"}
-  ],
+  expandFieldsOfSyncGodownEntry:[{"fieldName":"sterileBatchNumber","coloumnName":"灭菌批号"}],
   //出库单扩展字段
-  expandFieldsOfSyncGodownOut:[
-    {"fieldName":"sterileBatchNumber","coloumnName":"灭菌批号"}
-  ],
+  expandFieldsOfSyncGodownOut:[{"fieldName":"sterileBatchNumber","coloumnName":"灭菌批号"}],
 	  //是否禁用用户管理同步按钮
-  hiddenUserSyncButton:false
+  hiddenUserSyncButton:false,
+	  	  //申请单界面是否显示选择模板的下拉框
+	isOpenLoadTemplateByUnit : true,
+		//创建新申请单时，不加载科室申领模板到表单，只显示选择模板的下拉框，需要用户手工去选择模板加载
+  notLoadApplyTemplateWhenCreateDeptApplication	: true,
+	  //回收界面是否显示选择模板的下拉框
+	  isOpenLoadTemplateByUnitInRecyclingModule : true,
+		  //添加回收申请单是否默认加载申领模板
+	  isLoadApplyTemplateForAddRecycleRecord : false,
+  //回收界面点击消毒物品的回收数量单元格的响应方式
+	  respondModeWhenClickRecycleAmounCellOfDisinfectedItem : 1,
+  //启用打印标签输出打印机设置功能	
+  enablePrintLabelsOutputPrinterSettingsFunction : true,
+  //不检查打印是否成功的状态
+  doNotCheckPrintStatus  : true,
+  //金额保留小数点后2位
+  moneyDigitCount:2
 }
\ No newline at end of file