Index: ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java =================================================================== diff -u -r13528 -r13547 --- ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java (.../ReceiveRecordManagerImpl.java) (revision 13528) +++ ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java (.../ReceiveRecordManagerImpl.java) (revision 13547) @@ -339,7 +339,9 @@ // if(diposableGoodsIDsSet.size() == 0){ // throw new RuntimeException("物品已被删除!"); // } - lockAndGetDiposableGoodsResources(disposableGoodsIDsSet,disposableGoodsStockIdsSet,expensiveDisposablegoodsIdsSet, disposableGoodsBatchStockIdsSet, identificationIdsSet, idToDisposableGoodsMap,idToDiposableGoodsStockMap, idToExpensiveDisposablegoodsMap,idToBatchStockMap, idToIdentificationMap , record.getWarehouseId()); + if(CollectionUtils.isNotEmpty(disposableGoodsIDsSet)){ + lockAndGetDiposableGoodsResources(disposableGoodsIDsSet,disposableGoodsStockIdsSet,expensiveDisposablegoodsIdsSet, disposableGoodsBatchStockIdsSet, identificationIdsSet, idToDisposableGoodsMap,idToDiposableGoodsStockMap, idToExpensiveDisposablegoodsMap,idToBatchStockMap, idToIdentificationMap , record.getWarehouseId()); + } // 保存领用记录,后面需要绑定领用记录和itemID record.setDepartCoding(AcegiHelper.getLoginUser().getCurrentOrgUnitCode());