Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java =================================================================== diff -u -r12828 -r12930 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 12828) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 12930) @@ -351,14 +351,20 @@ DisposableGoodsBatchStock disposableGoodsBatchStock = diposableGoodBatchStockManager .getDiposableGoodBatchStock(diposableGoodsId, batchNumber); + String barcode = ""; + if (disposableGoodsBatchStock != null){ + barcode = disposableGoodsBatchStock.getBarcode(); + } + GodownEntryItem godownEntryItem = godownEntryItemManager.getGodownEntryItemById(itemId); String specification = godownEntryItem.getDiposableGoods() .getSpecification(); if (StringUtils.isBlank(specification)) { specification = ""; } + buffer.append(godownEntryItem.getDiposableGoods().getName() - + "#&" + disposableGoodsBatchStock.getBarcode() + + "#&" + barcode + "#&" + expDate + "#&" + supplierName + "#&" + batchNumber + "#&" + specification + ";"); }