Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
===================================================================
diff -u -r28952 -r28971
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml	(.../HIS.xml)	(revision 28952)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml	(.../HIS.xml)	(revision 28971)
@@ -105,15 +105,5 @@
 	</bean>
 	
 	<!-- InventoryDao接口的实现， 由MyBatis实现-->
-    <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="hisDataSource" />
-                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml" />
-                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
-            </bean>
-       </property>
-    </bean>  
+    <bean id="inventoryDao" class="com.forgon.disinfectsystem.inventorymanagement.dao.gdszyy.InventoryDaoImpl"></bean>  
 </beans>
\ No newline at end of file
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryStockWebServiceImpl.java
===================================================================
diff -u -r28956 -r28971
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryStockWebServiceImpl.java	(.../InventoryStockWebServiceImpl.java)	(revision 28956)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryStockWebServiceImpl.java	(.../InventoryStockWebServiceImpl.java)	(revision 28971)
@@ -264,11 +264,16 @@
 					String name = itemJson.optString("NAME");
 					String specification = itemJson.optString("Specification");
 					String unit = itemJson.optString("Unit");
+					String amountStr = itemJson.optString("QUANTITY");
 					Double amount = itemJson.optDouble("QUANTITY", 0.0);
 					if(StringUtils.isBlank(name) || StringUtils.isBlank(specification)){
 						xmlResult += " <Return> <RETCODE>1</RETCODE> <RETMSG>一次性物品名称和规格不能为空！</RETMSG> <Content> </Content> </Return>";
 						return xmlResult;
 					}
+					if(StringUtils.isBlank(amountStr) || !StringUtils.isNumeric(amountStr) || Double.valueOf("0" + amountStr.substring(amountStr.indexOf("."))).doubleValue() > 0.0){
+						xmlResult += " <Return> <RETCODE>1</RETCODE> <RETMSG>一次性物品数量必须为整数！</RETMSG> <Content> </Content> </Return>";
+						return xmlResult;
+					}
 					// 先按物资编码查找一次性物品定义
 					DisposableGoods disposableGoods = null;
 					if(StringUtils.isNotBlank(inventorySerialNumber)){
@@ -278,7 +283,7 @@
 						// 再按名称和规格查找
 						disposableGoods = diposableGoodsManager.get(name, specification);
 					}
-					if(disposableGoods == null){
+					/*if(disposableGoods == null){
 						xmlResult += " <Return> <RETCODE>1</RETCODE> <RETMSG>一次性物品" + name + "[" + specification + "]" + " 不存在！</RETMSG> <Content> </Content> </Return>";
 						return xmlResult;
 					}
@@ -291,20 +296,22 @@
 					if(!StringUtils.equals(specification, disposableGoods.getSpecification())){
 						xmlResult += " <Return> <RETCODE>1</RETCODE> <RETMSG>物资编码为【" + inventorySerialNumber + "】的一次性物品【" + disposableGoods.getName() + "】规格为【" + disposableGoods.getSpecification() + "】！</RETMSG> <Content> </Content> </Return>";
 						return xmlResult;
-					}
+					}*/
 					// 一次性物品单位判断
-					Integer transferScale = 1;
-					if(!StringUtils.equals(unit, disposableGoods.getUnit())){
-						if(!StringUtils.equals(unit, disposableGoods.getMiddlePackageUnit())){
-							String message = "OES系统的物品【" + name + "】【" + specification + "】的单位为【" + unit + "】，供应室CSSD系统的单位为【" + disposableGoods.getUnit() 
-									+ "】，申领单位为【" + disposableGoods.getMiddlePackageUnit() + "】，OES系统的单位与供应室系统的单位和申领单位都不相同，无法进行数量转换，请处理好单位对应关系后再进行推送。";
-							xmlResult += " <Return> <RETCODE>1</RETCODE> <RETMSG>" + message + "</RETMSG> <Content> </Content> </Return>";
-							return xmlResult;
-						}else{
-							transferScale = disposableGoods.getTransferScale();
+					if(disposableGoods != null){
+						Integer transferScale = 1;
+						if(!StringUtils.equals(unit, disposableGoods.getUnit())){
+							if(!StringUtils.equals(unit, disposableGoods.getMiddlePackageUnit())){
+								String message = "OES系统的物品【" + name + "】【" + specification + "】的单位为【" + unit + "】，供应室CSSD系统的单位为【" + disposableGoods.getUnit() 
+										+ "】，申领单位为【" + disposableGoods.getMiddlePackageUnit() + "】，OES系统的单位与供应室系统的单位和申领单位都不相同，无法进行数量转换，请处理好单位对应关系后再进行推送。";
+								xmlResult += " <Return> <RETCODE>1</RETCODE> <RETMSG>" + message + "</RETMSG> <Content> </Content> </Return>";
+								return xmlResult;
+							}else{
+								transferScale = disposableGoods.getTransferScale();
+							}
 						}
+						amount = amount * transferScale;
 					}
-					amount = amount * transferScale;
 					itemJson.put("QUANTITY", Integer.valueOf(amount.intValue()).toString());
 				}
 				json.put("TRANSFERSET", transfersetJsonArray);