Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js
===================================================================
diff -u -r35597 -r37508
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js	(.../config.js)	(revision 35597)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js	(.../config.js)	(revision 37508)
@@ -61,18 +61,43 @@
 	notShowZeroStorage:true,
 		//是否启用回收申请单不发货科室配置
   enableRecyclingApplicationNotInvoice:true,
-  //启用使用记录申请单的扩展名
+	  //物资编码
+  disposableGoodsInventorySerialNumber:true,
+  //使用记录转换申请单的备注格式
+  //useRecordConvertRecyclingApplicationRemark:@useRecordRemark,
+  enableUrgentFunction:true,
+    //外来器械拆分小包名称带总拆包数量,格式为:n/m
+  nameIncludeSplitTotalAmountForSplitForeignTousse:true,
+   //物品签收2
+  signModuleVersion:2,
+ //启用使用记录申请单的扩展名
   enableUseRecordFormExtensionFields:["主刀医生核算科室"],
   //使用记录表单的必填项配置
-  notAllowBlankFieldsOnUseRecordPage : ["doctorAccountDepart"],
-  //启用使用记录（主刀医生核算科室）报表
+ // notAllowBlankFieldsOnUseRecordPage : ["doctorAccountDepart"],
+ //启用使用记录（主刀医生核算科室）报表
   enableUseRecordByChiefSurgeonDoctorsAccountingDepartment:true,
-  //启用一次性物品定义的是否收费字段
+//启用一次性物品定义的是否收费字段
   enableWheterToChargeFieldOfDisposableGoods:true,
-  //器械包工作量统计报表扩展列配置
+ //启用手术器械图谱
+  toussePicturesShow:true,
+//使用记录录入明细报表扩展列配置
+ expandColoumnsConfigOfUsingRecordEntryDetailReports:[{"coloumnName":"doctorAccountDepart","displayText":"主刀医生核算科室"}, {"coloumnName":"ascriptionDepartment","displayText":"病人所属科室"},{"coloumnName":"isUrgent","displayText":"是否急消"}, {"coloumnName":"tousseGroupName","displayText":"器械包分组"}],
+  //外来器械申请单增加必填项配置
+  notAllowBlankFieldsOnForeignTousseInfoPage : ["ascriptionDepartment"],
+    //使用记录录入明细报表扩展列配置
+  expandColoumnsConfigOfUsingRecordEntryDetailReports:[{"coloumnName":"doctorAccountDepart","displayText":"主刀医生核算科室"}, {"coloumnName":"ascriptionDepartment","displayText":"病人所属科室"},{"coloumnName":"isUrgent","displayText":"是否急消"}, {"coloumnName":"tousseGroupName","displayText":"器械包分组"}],
+  //配置项外来器械申请单统计报表扩展列配置
+  extendedColumnConfigOfForeignTousseApplicationReport:["isUrgent","doctorAccountDepart"],
+    //器械包工作量统计报表扩展列配置
   extendedColumnConfigOfTousseWork:["tousseGroupName","urgentAmount","packagingAmount"],
+    //在外来器械申请单上显示该扩展字段"主刀医生核算科室"
+  expandFieldsOfForeignTousseApplicationForm:["doctorAccountDepart"],
   //明细核算月报扩展列配置
   extendedColumnConfigOfDetailedAccountingMonthlyReport:["tousseGroupName"],
   //是否启用加急功能
-  enableUrgentFunction:true
+  enableUrgentFunction:true,
+	  //是否禁用组织机构管理同步按钮
+  hiddenOrgunitSyncButton:true,
+	  //是否禁用用户管理同步按钮
+  hiddenUserSyncButton:false
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/spring/HERP.xml
===================================================================
diff -u -r27966 -r37508
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/spring/HERP.xml	(.../HERP.xml)	(revision 27966)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/spring/HERP.xml	(.../HERP.xml)	(revision 37508)
@@ -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://172.16.30.31:1433;databaseName=UFDATA_008_2019" />  
-        <property name="user" value="sa" />  
-        <property name="password" value="1112" />  
+    	<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实现-->
@@ -42,21 +42,11 @@
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="inventoryDataSource" />
-                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_CKD_Mapper.xml" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
             </bean>
        </property>
     </bean>
     
-    <bean id="syncSupplierDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
-       <property name="mapperInterface"  
-           value="com.forgon.disinfectsystem.datasynchronization.dao.SyncSupplierDao" />  
-        <property name="sqlSessionFactory">
-            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="inventoryDataSource" />
-                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gzzyyfs/interfaces/mybatis/SyncSupplierMapper.xml" />
-                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.entity.basedatamanager.supplier" />
-            </bean>
-       </property>
-    </bean>
+
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js
===================================================================
diff -u -r24622 -r37508
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js	(.../printConfig.js)	(revision 24622)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js	(.../printConfig.js)	(revision 37508)
@@ -331,11 +331,11 @@
         	rowHeight : 25,
         	position : ["100","1%","97%","305"],
         	columns : [
-                {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
-                {header : "名称", dataIndex : 'goodsName', width : 150, align : 'left', fontSize : 11},
-                {header : "规格", dataIndex : 'sp', width : 150, align : 'center', fontSize : 11},
-                {header : "包装规格", dataIndex : 'packageSpec', width : 120, align : 'center', fontSize : 11},
-                {header : "单位", dataIndex : 'unit', width : 55, align : 'center', fontSize : 11},
+                {header : "序号", dataIndex : 'serialNumber', width : 45, align : 'center', fontSize : 11},
+                {header : "名称", dataIndex : 'goodsName', width : 220, align : 'left', fontSize : 11},
+                {header : "规格", dataIndex : 'sp', width : 140, align : 'center', fontSize : 11},
+                {header : "包装规格", dataIndex : 'packageSpec', width : 100, align : 'center', fontSize : 11},
+                {header : "单位", dataIndex : 'unit', width : 45, align : 'center', fontSize : 11},
                 {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11},
                 {header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11},
                 {header : "金额", dataIndex : 'rowPrice', width : 60, align : 'right', fontSize : 11}