Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
===================================================================
diff -u -r26490 -r27608
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 26490)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 27608)
@@ -238,13 +238,14 @@
 	
 	/**
 	 * 根据一次性物品id查询出该一次性物品最近一条入库单明细数据
+	 * 只查找入库单关联的物品信息，排除掉调拨单关联的物品信息(GZFDZL-131)
 	 * @param disposableGoodsId
 	 * @return
 	 */
 	public GodownEntryItem getLastGodownEntryByDisposableGoodsId(String disposableGoodsId){
 		GodownEntryItem godownEntryItem = null;
 		String sql = "from GodownEntryItem po where 1=1 and disposableGoodsID= " + disposableGoodsId
-				+ " and godownEntry_id in (select id from GodownEntry where type='"+GodownEntry.TYPE_IN+"') order by id desc";
+				+ " and godownEntry_id in (select id from GodownEntry where type='"+GodownEntry.TYPE_IN+"' and subType != '"+GodownEntry.SUBTYPE_MOVE_IN+"') order by id desc";
 		List<GodownEntryItem> list = objectDao.findByHql(sql,0,1);
 		godownEntryItem = CollectionUtils.isNotEmpty(list) ? list.get(0) : null;
 		return godownEntryItem;