Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r21974 -r21988
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 21974)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 21988)
@@ -2902,41 +2902,39 @@
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			Date date = new Date();
 			//根据入库单id数组获得入库单明细集合
-			String sql = String.format("where %s", SqlUtils.getStringFieldInCollectionsPredicate(
+			String sql = String.format("where %s", SqlUtils.getNonStringFieldInCollectionsPredicate(
 					"po.godownEntry.id", godownEntryIdsStrList));
 			@SuppressWarnings("unchecked")
 			List<GodownEntryItem> godownEntryList = objectDao.findBySql(GodownEntryItem.class.getSimpleName(), sql);
 			if(CollectionUtils.isNotEmpty(godownEntryList)){
 				for (GodownEntryItem godownEntryItem : godownEntryList) {
-					Long disposableGoodsID = godownEntryItem.getDisposableGoodsID();
-					//根据物品id获得批次号集合
-					List<DisposableGoodsBatch> disposableGoodsBatchList = diposableGoodsManager.getDisposableGoodsBatchesByDisposableGoodsID(disposableGoodsID);
-					if (disposableGoodsBatchList == null) {
+					Long DisposableGoodsBatchID = godownEntryItem.getDisposableGoodsBatchID();
+					//获得批次号对象
+					DisposableGoodsBatch disposableGoodsBatch = diposableGoodsManager.getDisposableGoodsBatchById(DisposableGoodsBatchID);
+					if (disposableGoodsBatch == null) {
 						continue;
 					}
-					for (DisposableGoodsBatch disposableGoodsBatch : disposableGoodsBatchList) {
-						if (sb.length() > 0) {
-							sb.append(";");
-						}
-						String expDate = "";
-						if (disposableGoodsBatch.getExpDate() != null) {
-							expDate = sdf.format(disposableGoodsBatch.getExpDate());
-						}
-						// 更新打印状态
-						disposableGoodsBatch.setHasPrinted(Constants.STR_YES);
-						disposableGoodsBatch.setPrintTime(date);
-						diposableGoodsManager.saveOrUpdate(disposableGoodsBatch);
-						String specification = "";
-						if (disposableGoodsBatch.getDiposableGoods().getSpecification() != null) {
-							specification = disposableGoodsBatch.getDiposableGoods()
-									.getSpecification().trim();
-						}
-						sb.append(disposableGoodsBatch.getDiposableGoods().getName()
-								+ "#&" + disposableGoodsBatch.getBarcode() + "#&"
-								+ expDate + "#&" + disposableGoodsBatch.getSupplierName()
-								+ "#&" + disposableGoodsBatch.getBatchNumber() + "#&"
-								+ specification);
+					if (sb.length() > 0) {
+						sb.append(";");
 					}
+					String expDate = "";
+					if (disposableGoodsBatch.getExpDate() != null) {
+						expDate = sdf.format(disposableGoodsBatch.getExpDate());
+					}
+					// 更新打印状态
+					disposableGoodsBatch.setHasPrinted(Constants.STR_YES);
+					disposableGoodsBatch.setPrintTime(date);
+					diposableGoodsManager.saveOrUpdate(disposableGoodsBatch);
+					String specification = "";
+					if (disposableGoodsBatch.getDiposableGoods().getSpecification() != null) {
+						specification = disposableGoodsBatch.getDiposableGoods()
+								.getSpecification().trim();
+					}
+					sb.append(disposableGoodsBatch.getDiposableGoods().getName()
+							+ "#&" + disposableGoodsBatch.getBarcode() + "#&"
+							+ expDate + "#&" + disposableGoodsBatch.getSupplierName()
+							+ "#&" + disposableGoodsBatch.getBatchNumber() + "#&"
+							+ specification);
 				}
 				return sb.toString();
 			}