Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
===================================================================
diff -u -r17073 -r17090
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 17073)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 17090)
@@ -75,7 +75,8 @@
 		}else{
 			goodsDefIdPredicate = SqlUtils.getNonStringFieldInCollectionsPredicate("materialDefinitionId", goodsDefId);
 		}
-		String sql = " where 1=1 and " + wareHouseIdPredicate + " and " + goodsDefIdPredicate + " and " + amountPredicate;
+		//为了材料扣库存的时候，写测试用例进行判断，添加按id排序，效果是先入库的先扣
+		String sql = " where 1=1 and " + wareHouseIdPredicate + " and " + goodsDefIdPredicate + " and " + amountPredicate + " order by id asc";
 		return objectDao.findBySql_ForUpdate(GoodsStock.class.getSimpleName(), sql);
 	}